fix："优化汇付入网接口"

src/main/java/com/szwl/controller/THuifuMchController.java

@@ -83,39 +83,52 @@ public class THuifuMchController {
 
     @ApiOperation(value = "商户入网")
     @PostMapping("/createMch")
-    public ResponseModel<?> createMch(@RequestBody THuifuMchCheck huifuMchCheck) {
+    public ResponseModel<?> createMch(@RequestBody THuifuMchCheck newHuifuMchCheck) {
         // 步骤
-        Integer steps = huifuMchCheck.getBindingSteps();
+        Integer steps = newHuifuMchCheck.getBindingSteps();
         LambdaQueryWrapper<THuifuMchCheck> query = Wrappers.lambdaQuery();
-        query.eq(THuifuMchCheck::getAdminId, huifuMchCheck.getAdminId());
+        query.eq(THuifuMchCheck::getAdminId, newHuifuMchCheck.getAdminId());
         THuifuMchCheck tHuifuMchCheck = tHuifuMchCheckService.getOne(query);
         switch (steps) {
             case 0:
                 // 提交证件信息
-                huifuMchCheck.setBindingSteps(1);
+                newHuifuMchCheck.setBindingSteps(1);
                 if (tHuifuMchCheck == null) {
                     // 没有，直接保存
-                    huifuMchCheck.setCreateDate(new Date());
-                    huifuMchCheck.setModifyDate(new Date());
-                    tHuifuMchCheckService.save(huifuMchCheck);
+                    newHuifuMchCheck.setCreateDate(new Date());
+                    newHuifuMchCheck.setModifyDate(new Date());
+                    tHuifuMchCheckService.save(newHuifuMchCheck);
                 } else {
                     // 有，更新
-                    huifuMchCheck.setModifyDate(new Date());
-                    BeanUtil.copyProperties(huifuMchCheck, tHuifuMchCheck,
-                            CopyOptions.create()
-                                    .setIgnoreNullValue(true)  // 忽略源对象中的 null 值
-                                    .setIgnoreError(true)     // 忽略类型不匹配等错误
-                    );
+                    tHuifuMchCheck.setModifyDate(new Date());
+                    tHuifuMchCheck.setRegName(newHuifuMchCheck.getRegName());
+                    tHuifuMchCheck.setType(newHuifuMchCheck.getType());
+                    tHuifuMchCheck.setName(newHuifuMchCheck.getName());
+                    tHuifuMchCheck.setPhone(newHuifuMchCheck.getPhone());
+                    tHuifuMchCheck.setCertNo(newHuifuMchCheck.getCertNo());
+                    tHuifuMchCheck.setCertValidityType(newHuifuMchCheck.getCertValidityType());
+                    tHuifuMchCheck.setCertBeginDate(newHuifuMchCheck.getCertBeginDate());
+                    tHuifuMchCheck.setCertEndDate(newHuifuMchCheck.getCertEndDate());
+                    tHuifuMchCheck.setProvId(newHuifuMchCheck.getProvId());
+                    tHuifuMchCheck.setAreaId(newHuifuMchCheck.getAreaId());
+                    tHuifuMchCheck.setDistrictId(newHuifuMchCheck.getDistrictId());
+                    tHuifuMchCheck.setLicenseValidityType(newHuifuMchCheck.getLicenseValidityType());
+                    tHuifuMchCheck.setLicenseCode(newHuifuMchCheck.getLicenseCode());
+                    tHuifuMchCheck.setLicenseBeginDate(newHuifuMchCheck.getLicenseBeginDate());
+                    tHuifuMchCheck.setBindingSteps(1);
                     tHuifuMchCheckService.updateById(tHuifuMchCheck);
                 }
                 return R.ok();
             case 1:
                 // 提交结算信息
-                tHuifuMchCheck.setCardType(huifuMchCheck.getCardType());
-                tHuifuMchCheck.setCardName(huifuMchCheck.getCardName());
-                tHuifuMchCheck.setCardNo(huifuMchCheck.getCardNo());
-                tHuifuMchCheck.setBranchCode(huifuMchCheck.getBranchCode());
-                tHuifuMchCheck.setSettType(huifuMchCheck.getSettType());
+                tHuifuMchCheck.setCardType(newHuifuMchCheck.getCardType());
+                tHuifuMchCheck.setCardName(newHuifuMchCheck.getCardName());
+                tHuifuMchCheck.setCardNo(newHuifuMchCheck.getCardNo());
+                tHuifuMchCheck.setBranchCode(newHuifuMchCheck.getBranchCode());
+                tHuifuMchCheck.setBankCode(newHuifuMchCheck.getBankCode());
+                tHuifuMchCheck.setCardProvId(newHuifuMchCheck.getCardProvId());
+                tHuifuMchCheck.setCardAreaId(newHuifuMchCheck.getCardAreaId());
+                tHuifuMchCheck.setSettType(newHuifuMchCheck.getSettType());
                 tHuifuMchCheck.setBindingSteps(2);
                 tHuifuMchCheck.setModifyDate(new Date());
                 tHuifuMchCheckService.updateById(tHuifuMchCheck);

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -630,12 +630,12 @@ public class TPromoCodeController {
             query.like(TPromoCode::getIsUse, isUse);
         }
         if (StringUtils.isNotEmpty(useStartDate) && StringUtils.isNotEmpty(useEndDate)) {
-            query.gt(TPromoCode::getUseDate, useStartDate);
-            query.lt(TPromoCode::getUseDate, useEndDate);
+            query.gt(TPromoCode::getUseDate, useStartDate + " 00:00:00");
+            query.lt(TPromoCode::getUseDate, useEndDate + " 23:59:59");
         }
         if (StringUtils.isNotEmpty(createStartDate) && StringUtils.isNotEmpty(createEndDate)) {
-            query.gt(TPromoCode::getCreateDate, createStartDate);
-            query.lt(TPromoCode::getCreateDate, createEndDate);
+            query.gt(TPromoCode::getCreateDate, createStartDate + " 00:00:00");
+            query.lt(TPromoCode::getCreateDate, createEndDate + " 23:59:59");
         }
         query.orderByDesc(TPromoCode::getCreateDate);
         Page<TPromoCode> page = new Page<>(current, size, true);