Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2024-01-31 855712e41283375ad2a19544bcb7f069a0d389a2

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

@@ -56,12 +56,15 @@
                    OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
                            .eq("orderNo", order_id));
                    if (orderNo!=null){
                        orderNo.setRefuseReason(null);
                        operatorAuthService.updateById(orderNo);
                        Integer operatorId = orderNo.getOperatorId();
                        OperatorUser operatorId1 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
                                .eq("operatorId", operatorId));
                        if (operatorId1!=null){
                            operatorId1.setAlipayNum(smid);
                            operatorId1.setAlipayAudit(2);
                            operatorUserService.updateById(operatorId1);
                        }
                    }
                }else if (msgApi.equals("ant.merchant.expand.indirect.zft.rejected")){
@@ -71,6 +74,7 @@
                    String order_id = json.getString("order_id");
                    OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
                            .eq("orderNo", order_id));

                    if (orderNo!=null){
                        orderNo.setRefuseReason(reason);
                        operatorAuthService.updateById(orderNo);