运营商bug修改

44323

2023-12-12 cb574e765ea42dcde15a0766b7f707f2c54a005e

运营商bug修改

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java

@@ -134,32 +134,32 @@
                operatorAuth.setQrCode(qr_code);
                operatorAuthService.updateById(operatorAuth);
            }
            if (operatorAuth.getOrderStatus().equals("AUDIT_REJECT")
            || operatorAuth.getOrderStatus().equals("AUDIT_FREEZE")
                    || operatorAuth.getOrderStatus().equals("CANCELED")){
                // 未通过审核 撤销申请单
                AlipayClient alipayClient1 = new DefaultAlipayClient
                        ("https://openapi.alipay.com/gateway.do",
                                "2021004123692417","MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==",
                                "json","GBK",
                                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
                AlipayMerchantIndirectAuthorderCloseRequest request = new AlipayMerchantIndirectAuthorderCloseRequest();
                request.setBizContent("{" +
                        "  \"order_no\":\""+operatorAuth.getOrderNo()+"\"," +
                        "  \"out_biz_no\":\""+operatorAuth.getOutBizNo()+"\"" +
                        "}");
                AlipayMerchantIndirectAuthorderCloseResponse response = null;
                try {
                    response = alipayClient1.execute(request);
                } catch (AlipayApiException e) {
                    e.printStackTrace();
                }
                if(response.isSuccess()){
                    System.out.println("撤销申请单调用成功");
                } else {
                    System.out.println("撤销申请单调用失败");
                }
            }
//            if (operatorAuth.getOrderStatus().equals("AUDIT_REJECT")
//            || operatorAuth.getOrderStatus().equals("AUDIT_FREEZE")
//                    || operatorAuth.getOrderStatus().equals("CANCELED")){
//                // 未通过审核 撤销申请单
//                AlipayClient alipayClient1 = new DefaultAlipayClient
//                        ("https://openapi.alipay.com/gateway.do",
//                                "2021004123692417","MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==",
//                                "json","GBK",
//                                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
//                AlipayMerchantIndirectAuthorderCloseRequest request = new AlipayMerchantIndirectAuthorderCloseRequest();
//                request.setBizContent("{" +
//                        "  \"order_no\":\""+operatorAuth.getOrderNo()+"\"," +
//                        "  \"out_biz_no\":\""+operatorAuth.getOutBizNo()+"\"" +
//                        "}");
//                AlipayMerchantIndirectAuthorderCloseResponse response = null;
//                try {
//                    response = alipayClient1.execute(request);
//                } catch (AlipayApiException e) {
//                    e.printStackTrace();
//                }
//                if(response.isSuccess()){
//                    System.out.println("撤销申请单调用成功");
//                } else {
//                    System.out.println("撤销申请单调用失败");
//                }
//            }

        }
    }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java

@@ -15,10 +15,7 @@
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IEvaluationService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.StoreConfigService;
import com.dsh.guns.modular.system.service.*;
import org.apache.ibatis.ognl.Evaluation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -58,6 +55,8 @@
    @Resource
    private UserMapper userMapper;

    @Autowired
    private ITSiteService siteService;
    @Resource
    private StoreConfigService storeConfigService;
    @Autowired

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java

@@ -82,7 +82,6 @@
    @ResponseBody
    public List<ZTreeNode> tree() {
        List<ZTreeNode> tree = this.deptService.tree();

        tree.add(ZTreeNode.createParent());
        return tree;
    }
@@ -116,7 +115,6 @@
        List<Map<String, Object>> list = this.deptService.list(condition);
        if (UserExt.getUser().getObjectType()==2){
            List<Map<String, Object>> filteredRoles = list.stream()
                    .filter(role -> role.containsKey("version") && role.get("version").equals(1))
                    .collect(Collectors.toList());
            return filteredRoles;
        }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;

import java.io.Serializable;

@@ -17,6 +18,7 @@
 * @author stylefeng
 * @since 2017-07-11
 */
@Data
@TableName("sys_dept")
public class Dept extends Model<Dept> {

@@ -60,7 +62,8 @@
    private Integer objectType;
    @TableField("objectId")
    private Integer objectId;

    @TableField("isSale")
    private Integer isSale;
    public Integer getObjectType() {
        return objectType;
    }
@@ -100,6 +103,8 @@
    public void setPid(Integer pid) {
        this.pid = pid;
    }



    public String getPids() {
        return pids;
@@ -157,6 +162,7 @@
            ", fullname=" + fullname +
            ", tips=" + tips +
            ", version=" + version +
            ", isSale=" + isSale +
            "}";
    }
}

 cloud-server-management/src/main/resources/mapper/DeptMapper.xml

@@ -24,23 +24,21 @@
        'false'
        END
        ) as isOpen from sys_dept where 1=1
        <if test="type ==3 ">
            and objectType =3 and objectId =#{id}
        </if>
        and objectType =#{type} and objectId =#{id}
    </select>

    <select id="list" resultType="map">
        select * from sys_dept where 1=1
        <if test="condition != null and condition != ''">
            and  simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
        </if>
        <if test="objectType == 3">
            and  objectType = 3 and objectId =#{objectId}
        </if>
        <if test="objectType == 1">
            and  objectType = 1
        </if>
        order by num ASC
    <select id="list" resultType="java.util.Map">
            select * from sys_dept where 1=1
            <if test="condition != null and condition != ''">
                and  simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
            </if>
            <if test="objectType == 3">
                and  objectType = 3 and objectId =#{objectId}
            </if>
            <if test="objectType == 1">
                and  objectType = 1
            </if>
            order by num ASC
    </select>


</mapper>

 cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml

@@ -20,22 +20,6 @@
        t1.name AS operatorName,
        t2.name AS userName,
        t2.phone,
        t3.alipay AS platform,
        t3.alipayProportion AS proportion,
        t3.alipayNum AS number,
        t3.alipayAudit AS audit,
        t3.alipayType AS type
        FROM t_operator_user t3
        LEFT JOIN t_operator t1 ON t3.operatorId = t1.id
        LEFT JOIN sys_user t2 ON t1.userId = t2.id AND t2.objectType = 2

        UNION ALL

        SELECT t3.id,
        t1.id AS operatorId,
        t1.name AS operatorName,
        t2.name AS userName,
        t2.phone,
        t3.wechat AS platform,
        t3.wechatProportion AS proportion,
        t3.wechatNum AS number,
@@ -44,6 +28,20 @@
        FROM t_operator_user t3
        LEFT JOIN t_operator t1 ON t3.operatorId = t1.id
        LEFT JOIN sys_user t2 ON t1.userId = t2.id AND t2.objectType = 2
        UNION ALL
        SELECT t3.id,
        t1.id AS operatorId,
        t1.name AS operatorName,
        t2.name AS userName,
        t2.phone,
        t3.alipay AS platform,
        t3.alipayProportion AS proportion,
        t3.alipayNum AS number,
        t3.alipayAudit AS audit,
        t3.alipayType AS type
        FROM t_operator_user t3
        LEFT JOIN t_operator t1 ON t3.operatorId = t1.id
        LEFT JOIN sys_user t2 ON t1.userId = t2.id AND t2.objectType = 2
        ) AS t1
        where 1=1
        <if test="userName !=null and userName !=''">

 cloud-server-management/src/main/resources/mapper/TStoreMapper.xml

@@ -35,7 +35,8 @@
    </delete>

    <select id="listAll" resultType="com.dsh.guns.modular.system.model.TStoreListVo">
        select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left  join t_operator t3 on t1.operatorId = t3.id
        select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName
        from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left  join t_operator t3 on t1.operatorId = t3.id
        where 1=1
        <if test="provinceCode !=null and provinceCode !=''">
            and t1.provinceCode = #{provinceCode}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html

@@ -15,11 +15,13 @@
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="排序" underline="true"/>

                    <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
                <div class="col-sm-6">
                    <#input type="checkbox" id="isSale" name="是否为销售部门" underline="true"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html

@@ -9,33 +9,7 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            所在省
                                        </button>
                                    </div>
                                    <select class="form-control" id="pCode" onchange="TSite.oneChange(this)">
                                        <option value="">选择省</option>
                                        @for(obj in provinceList){
                                        <option value="${obj.code}">${obj.name}</option>
                                        @}
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            所在市
                                        </button>
                                    </div>
                                    <select class="form-control" id="cCode">
                                        <option value="">请先选择省</option>
                                    </select>
                                </div>
                            </div>

                            <div class="col-sm-3">
                                <#NameCon id="name" name="管理员姓名：" />
                            </div>

 cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js

@@ -42,7 +42,7 @@
    var index = layer.open({
        type: 2,
        title: '添加部门',
        area: ['800px', '420px'], //宽高
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/dept/dept_add'

 cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js

@@ -128,7 +128,10 @@
    if (!this.validate()) {
        return;
    }
    var elementById = document.getElementById("isSale");
    if (elementById.checked){

    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/dept/add", function(data){
        Feng.success("添加成功!");

 cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js

@@ -171,14 +171,13 @@
        Feng.error("请输入法人身份证地址");
        return;
    }
    if(type=="ENTERPRISE"){
    if(bodyType=="ENTERPRISE"){
        if ("" == $("#bName").val() || null == $("#bName").val()){
            Feng.error("请输入受益人姓名");
            return;
        }if ("" == $("#bPhone").val() || null == $("#bPhone").val()){
            Feng.error("请输入受益人手机号");
            return;
        }if ("" == $("#bAddress").val() || null == $("#bAddress").val()){
        }

        if ("" == $("#bAddress").val() || null == $("#bAddress").val()){
            Feng.error("请输入受益人身份证地址");
            return;
        }
@@ -341,8 +340,6 @@

TSite.search = function () {
    var queryData = {};
    queryData['province']  = $("#pCode").val();
    queryData['city'] =$("#cCode").val();
    queryData['userName'] =$("#name").val();
    queryData['phone'] =$("#phone").val();
    queryData['platform'] =$("#platform").val();
@@ -352,8 +349,6 @@
};

TSite.resetSearch = function () {
    $("#pCode").val("");
    $("#cCode").val("");
    $("#name").val("");
    $("#phone").val("");
    $("#platform").val("");