feats

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -371,6 +371,51 @@ public class TaApplicationController extends BaseController {
         }
     }
 
+    /**
+     * 绑卡
+     * @param id  实体ID
+     * @param makeCardParam 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/application/{id}/bindCard",method= RequestMethod.PUT)
+    @ApiOperation(value="绑卡", notes = "绑卡", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean bindCard(@ApiParam("对象ID") @PathVariable Integer id,
+                                 @ApiParam("更新内容") @RequestBody MakeCardParam makeCardParam) throws Exception{
+        SysUser sysUser = currentUser();
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_MAKER)) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        if (StringUtils.isEmpty(makeCardParam.getCardNo())) {
+            return ResponseBean.error("卡号不能为空");
+        } else {
+            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
+            if (taCardNo == null) {
+                return ResponseBean.error("卡号无效或者已使用");
+            }
+
+            // 将卡号置为已使用
+            taCardNo.setStatus(Constants.STATUS_NORMAL);
+            iTaCardNoService.updateById(taCardNo);
+
+            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", makeCardParam.getCardNo(), false, true);
+            if (null != taPetIdentity) {
+                return ResponseBean.error("卡号已被占用");
+            }
+        }
+
+        taApplication.setOriginCardNo(makeCardParam.getCardNo());
+        iTaApplicationService.updateById(taApplication);
+        TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
+        return ResponseBean.success(newCard);
+    }
+
+
     /**
      * 发证
      * @param id  实体ID
@@ -415,26 +460,6 @@ public class TaApplicationController extends BaseController {
             }
         }
 
-        if (StringUtils.isEmpty(makeCardParam.getCardNo())) {
-            return ResponseBean.error("卡号不能为空");
-        } else {
-            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
-            if (taCardNo == null) {
-                return ResponseBean.error("卡号无效或者已使用");
-            }
-
-            // 将卡号置为已使用
-            taCardNo.setStatus(Constants.STATUS_NORMAL);
-            iTaCardNoService.updateById(taCardNo);
-
-            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", makeCardParam.getCardNo(), false, true);
-            if (null != taPetIdentity) {
-                return ResponseBean.error("卡号已被占用");
-            }
-        }
-
-        // 关联证件
-        taApplication.setOriginCardNo(makeCardParam.getCardNo());
         taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
         taApplication.setMakeDate(LocalDateTime.now());
         taApplication.setMakeUser(sysUser.getUserId());
@@ -443,10 +468,14 @@ public class TaApplicationController extends BaseController {
         taApplication.setTrackingNo(makeCardParam.getTrackingNo());
         taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
 
-        if (iTaApplicationService.updateById(taApplication)){
-            TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
+        if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_REISSUE)) {
+            // 新办 续期，都需要重置有效期
+            iTaPetIdentityService.updateCardDate(taPetIdentity.getCardNo());
+        }
 
-            return ResponseBean.success(newCard);
+        if (iTaApplicationService.updateById(taApplication)){
+            return ResponseBean.success(taApplication);
         } else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/njyunzhi/pet_identity/service/ITaPetIdentityService.java

@@ -16,6 +16,8 @@ public interface ITaPetIdentityService extends IBaseService<TaPetIdentity> {
 
     TaPetIdentity createNewCard(TaApplication taApplication, MakeCardParam makeCardParam) throws Exception;
 
+    boolean updateCardDate(String cardNo) throws Exception;
+
     boolean extendDate(TaPetIdentity taPetIdentity) throws Exception;
 
     TaPetIdentity getByPet(String petId, String personId);

src/main/java/com/njyunzhi/pet_identity/service/impl/TaPetIdentityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njyunzhi.pet_identity.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.common.DateUtils;
 import com.njyunzhi.pet_identity.entity.SysSetting;
@@ -33,11 +34,9 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
     @Override
     public TaPetIdentity createNewCard(TaApplication taApplication, MakeCardParam makeCardParam) throws Exception {
 
-        SysSetting sysSetting = sysSettingMapper.selectById(Constants.SYSSETTING_CARD_EXPIRE);
-
         // 北京时间
         LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
-        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
+//        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
 
         TaPetIdentity taPetIdentity = new TaPetIdentity();
         taPetIdentity.setCardNo(makeCardParam.getCardNo());
@@ -52,8 +51,8 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         taPetIdentity.setPetImg1(taApplication.getImg1());
         taPetIdentity.setPetImg2(taApplication.getImg2());
         taPetIdentity.setAddress(taApplication.getAddress());
-        taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
-        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
+//        taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
+//        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
         taPetIdentity.setStatus(Constants.STATUS_NORMAL);
         taPetIdentity.setCreateDate(now);
 
@@ -71,6 +70,23 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         return taPetIdentity;
     }
 
+    @Override
+    public boolean updateCardDate(String cardNo) throws Exception {
+        SysSetting sysSetting = sysSettingMapper.selectById(Constants.SYSSETTING_CARD_EXPIRE);
+        // 北京时间
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
+
+
+        UpdateWrapper<TaPetIdentity> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("start_date", now);
+        updateWrapper.set("expire_date", expire);
+        updateWrapper.eq("card_no", cardNo);
+
+        return update(updateWrapper);
+    }
+
+
     @Override
     public boolean extendDate(TaPetIdentity taPetIdentity) throws Exception {