MERGE

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1019,11 +1019,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     }
                 }*/
                 UserSystemRegisterBo registerBo = BeanUtil.toBean(bo, UserSystemRegisterBo.class);
+                String tel = "";
                 if (Validator.isNotEmpty(user1)){
                     //手机号码存在，身份证不一致 (随机生成)
-                    registerBo.setTel(createTel());
+                    tel = createTel();
+                    registerBo.setTel(tel);
                 }else {
-                    registerBo.setTel(bo.getTelphone());
+                    tel = bo.getTelphone();
+                    registerBo.setTel(tel);
                 }
                 if(Validator.isNotEmpty(bo.getSex())){
                     if(bo.getSex().equals("男")){
@@ -1042,6 +1045,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 if(userId.longValue()>0){
                     UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
                     user.setUserId(userId);
+                    user.setTelphone(tel);
                     list1.add(user);
                     continue;
                 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopOrderGoodsOrgVo.java

@@ -34,4 +34,6 @@ public class TopOrderGoodsOrgVo implements Serializable {
     @ApiModelProperty("学习状态：0未开始，1学习中，2已结束")
     private String studyStatus;
 
+    private Long signId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderGoodsAddBo.java

@@ -82,6 +82,10 @@ public class TopOldOrderGoodsAddBo {
 
     @ApiModelProperty("学员状态：0待审核，-1已取消")
     private Integer checkStatus;
+    @ApiModelProperty("申请修改时间")
+    private Integer applyUpTime;
+    @ApiModelProperty("申请修改原因")
+    private String applyUpReason;
     @ApiModelProperty("旧系统自增ID")
     private Long signId;
     @ApiModelProperty("关联的旧系统自增ID（修改学员时使用）")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3943,6 +3943,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     goodsOrgVo.setDivideRate(item.getDivideRate());
                     goodsOrgVo.setDivideMoney(item.getDivideMoney());
                     goodsOrgVo.setDivideRateStr(item.getDivideRate() + "%");
+                    goodsOrgVo.setSignId(item.getSignId());
                     //学习状态
                     if (ObjectUtils.isNotNull(item.getGoodsType()) && ObjectUtils.isNotNull(item.getGradeId()) && item.getGoodsType() == 1) {
                         int count = userPeriodService.count(new LambdaQueryWrapper<UserPeriod>()
@@ -3976,6 +3977,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     goodsOrgVo.setDivideRate(item.getDivideRate());
                     goodsOrgVo.setDivideMoney(item.getDivideMoney());
                     goodsOrgVo.setDivideRateStr(item.getDivideRate() + "%");
+                    goodsOrgVo.setSignId(item.getSignId());
                     return goodsOrgVo;
                 }).collect(Collectors.toList());
                 orgVo.setGoodsOrgVos(collect);
@@ -5808,7 +5810,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             throw new CustomException("订单号错误");
         }
         //更新订单已收金额
-        order.setOrderReceived(bo.getOrderReceived());
+//        order.setOrderReceived(bo.getOrderReceived());
         if (ObjectUtils.isNotNull(order.getOrderReceived())) {
             order.setOrderReceived(bo.getOrderReceived().add(order.getOrderReceived()));
         } else {

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -321,6 +321,9 @@
         <if test="creditStatus != null and creditStatus != '' and creditStatus == 1">
             AND o.pay_price = o.order_received
         </if>
+        <if test="repairSign != null and repairSign != '' and repairSign == 1">
+            AND o.order_id = 0
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">
             AND o.invoice_status = #{invoiceStatus}
         </if>
@@ -1865,7 +1868,7 @@
             AND tenant_id = #{tenantId}
         </if>
         <if test="customerId != null and customerId != ''">
-            AND tenant_id  = #{customerId}
+            AND old_customer_id  = #{customerId}
         </if>
         AND tenant_id IS NOT NULL
         GROUP BY
@@ -1902,7 +1905,7 @@
             AND o.tenant_id = #{tenantId}
         </if>
         <if test="customerId != null and customerId != ''">
-            AND o.tenant_id  = #{customerId}
+            AND o.old_customer_id  = #{customerId}
         </if>
         AND o.tenant_id IS NOT NULL
         AND og.pay_status != 1
@@ -1974,7 +1977,7 @@
             AND ouu.business_name = #{businessName}
         </if>
         <if test="customerId != null and customerId != ''">
-            AND oo.tenant_id  = #{customerId}
+            AND oo.old_customer_id  = #{customerId}
         </if>
 
         GROUP BY
@@ -2027,7 +2030,7 @@
             AND 1=0
         </if>
         <if test="customerId != null and customerId != ''">
-            AND og.tenant_id  = #{customerId}
+            AND o.old_customer_id  = #{customerId}
         </if>
         AND og.refund_status != 2
         ) nou