merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -178,8 +178,8 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
 
     @Override
     public boolean commitmentSealUpload(CommitmentSealBo bo) {
-        //todo 承诺书校验
-
+        // 承诺书校验
+        checkCommitentSeal(bo);
         UserProfile userProfile = iUserProfileService.getById(bo.getId());
         if (ObjectUtils.isNull(userProfile)){
             throw new CustomException("学员资料不存在");
@@ -214,5 +214,9 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
         return iUserProfileService.updateById(userProfile);
     }
 
+    private void checkCommitentSeal(CommitmentSealBo bo) {
+
+    }
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -480,7 +480,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCreateUsername(bo.getCreateBy());//
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }
@@ -635,7 +635,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }
@@ -974,9 +974,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }
@@ -1377,9 +1378,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }
@@ -1573,9 +1575,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit"));
+        SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }

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

@@ -73,6 +73,15 @@ import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -3656,11 +3665,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             throw new CustomException("订单号错误");
         }
         //更新订单已收金额
-        if (ObjectUtils.isNotNull(order.getOrderReceived())) {
-            order.setOrderReceived(bo.getOrderReceived().add(order.getOrderReceived()));
-        } else {
-            order.setOrderReceived(bo.getOrderReceived());
-        }
+        order.setOrderReceived(bo.getOrderReceived());
+//        if (ObjectUtils.isNotNull(order.getOrderReceived())) {
+//            order.setOrderReceived(bo.getOrderReceived().add(order.getOrderReceived()));
+//        } else {
+//            order.setOrderReceived(bo.getOrderReceived());
+//        }
         order.setOrderUncollected(order.getPayPrice().subtract(order.getOrderReceived()));
         order.setOrderStatus(1);//已支付
         Integer payStatus = 0;