Merge remote-tracking branch 'origin/dev/one' into debug

diagbotman-service/src/main/java/com/diagbot/enums/CancelRenewalsEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 
+ * @Author: wangyu
+ * @Date: 13:07 2018/10/18
+ */
+public enum CancelRenewalsEnum implements KeyedNamed {
+    CANCEL_RENEWALS_ENUM(1,"取消"),
+    NOT_CANCEL(0, "未取消");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    CancelRenewalsEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CancelRenewalsEnum getEnum(Integer key) {
+        for (CancelRenewalsEnum item : CancelRenewalsEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        CancelRenewalsEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -212,7 +212,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
         openedProducts.setGmtCreate(DateUtil.now());
         UserRenewals userRenewals = new UserRenewals();
-        userRenewals.setRenewalsStutas(RenewalsEnum.RENEWALS.getKey());
+        userRenewals.setRenewalsStatus(RenewalsEnum.RENEWALS.getKey());
         userRenewals.setGmtModified(DateUtil.now());
         userRenewals.setModifier(UserUtils.getCurrentPrincipleID());
         userRenewals.setRenewalsNo(modifyOpeningTimeVO.getRenewalsNo());

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
+import com.diagbot.enums.CancelRenewalsEnum;
 import com.diagbot.enums.RenewalsEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -68,6 +69,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         BeanUtil.copyProperties(renewalsInfosVO,page);
         UserRenewalsWrapper userRenewalsWrapper =new UserRenewalsWrapper();
         BeanUtil.copyProperties(renewalsInfosVO,userRenewalsWrapper);
+        userRenewalsWrapper.setCancelRenewals(CancelRenewalsEnum.NOT_CANCEL.getKey());
         if(renewalsInfosVO.getOrgName()!=null && renewalsInfosVO.getOrgName()!=""){
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(renewalsInfosVO.getOrgName());
             userRenewalsWrapper.setUserId(rlist.data);
@@ -103,6 +105,22 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
     }
 
     public Boolean deleteRenewalsInfo(DeleteRenewalsInfoVO deleteRenewalsInfoVO){
-        return this.deleteUserRenewals(deleteRenewalsInfoVO.getId());
+        UserRenewals userRenewals =this.getById(deleteRenewalsInfoVO.getId());
+        userRenewals.setIsDeleted("Y");
+        if(!this.updateById(userRenewals)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "删除失败");
+        }
+        return true;
+    }
+
+    public Boolean cancelRenewalsInfo(DeleteRenewalsInfoVO deleteRenewalsInfoVO){
+        UserRenewals userRenewals =this.getById(deleteRenewalsInfoVO.getId());
+        userRenewals.setCancelRenewals(CancelRenewalsEnum.CANCEL_RENEWALS_ENUM.getKey());
+        if(!this.updateById(userRenewals)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "取消失败");
+        }
+        return true;
     }
 }

diagbotman-service/src/main/java/com/diagbot/vo/RenewalsInfosVO.java

@@ -15,7 +15,7 @@ public class RenewalsInfosVO extends Page {
     /**
      * 续费状态
      */
-    private Integer renewalsStutas;
+    private Integer renewalsStatus;
 
     /**
      * 机构名称

diagbotman-service/src/main/java/com/diagbot/web/UserRenewalsController.java

@@ -54,5 +54,14 @@ public class UserRenewalsController {
         return RespDTO.onSuc(userRenewalsFacade.deleteRenewalsInfo(deleteRenewalsInfoVO));
     }
 
+    @ApiOperation(value = "续费管理——取消续费[by:wangyu]",
+            notes = "id：续费id，必填<br>")
+    @PostMapping("/cancelRenewalsInfos")
+    @SysLogger("cancelRenewalsInfos")
+    @Transactional
+    public RespDTO<Boolean> cancelRenewalsInfos(@RequestBody DeleteRenewalsInfoVO deleteRenewalsInfoVO) {
+        return RespDTO.onSuc(userRenewalsFacade.cancelRenewalsInfo(deleteRenewalsInfoVO));
+    }
+
 
 }

diagbotman-service/src/main/resources/mapper/UserRenewalsMapper.xml

@@ -12,23 +12,27 @@
         <result column="modifier" property="modifier" />
         <result column="product_id" property="productId" />
         <result column="user_id" property="userId" />
-        <result column="renewals_stutas" property="renewalsStutas" />
+        <result column="renewals_status" property="renewalsStatus" />
         <result column="apply_time" property="applyTime" />
-        <result column="renewals_no" property="renewalsNo"></result>
+        <result column="renewals_no" property="renewalsNo"/>
+        <result column="cancel_renewals" property="cancelRenewals"/>
     </resultMap>
 
     <select id="selectProductIdByUserId" resultType="java.lang.Long">
-        SELECT r.product_id FROM `diag_user_renewals` r WHERE r.is_deleted = 'N' and r.renewals_stutas = 0 AND r.user_id =#{userId}
+        SELECT r.product_id FROM `diag_user_renewals` r WHERE r.is_deleted = 'N' and r.renewals_status = 0 AND r.user_id =#{userId}
     </select>
 
     <select id="selectUserRenewals" resultType="com.diagbot.dto.RenewalsInfosDTO">
         SELECT * FROM `diag_user_renewals` WHERE is_deleted = 'N'
-        <if test="renewalsInfosVO.renewalsStutas != null">
-              AND renewals_stutas = #{renewalsInfosVO.renewalsStutas}
+        <if test="renewalsInfosVO.renewalsStatus != null">
+              AND renewals_status = #{renewalsInfosVO.renewalsStatus}
         </if>
         <if test="renewalsInfosVO.startTime != null and renewalsInfosVO.endTime != null">
             AND apply_time BETWEEN #{renewalsInfosVO.startTime} and #{renewalsInfosVO.endTime}
         </if>
+        <if test="renewalsInfosVO.cancelRenewals != null and renewalsInfosVO.cancelRenewals != null">
+            AND cancel_renewals = #{renewalsInfosVO.cancelRenewals}
+        </if>
         <if test="renewalsInfosVO.userId != null and renewalsInfosVO.userId.size > 0">
             <foreach collection="renewalsInfosVO.userId" item="renewalsInfosVO.userId" open="and(" separator="or" close=")">
                 user_id = #{renewalsInfosVO.userId}
@@ -38,16 +42,16 @@
     </select>
     
     <update id="deleteUserRenewals">
-        UPDATE `diag_user_renewals` SET `is_deleted`='Y' WHERE (`id`=#{id})
+        UPDATE `diag_user_renewals` SET `cancel_renewals`=#{cancelRenewals} WHERE (`id`=#{id})
     </update>
     
-    <update id="updateRenewalStutas" parameterType="com.diagbot.entity.UserRenewals">
+    <update id="updateRenewalStatus" parameterType="com.diagbot.entity.UserRenewals">
 	UPDATE 
 	 diag_user_renewals a 
 	  <trim prefix="set" suffixOverrides=",">
 	  <if test="gmtModified != null">a.gmt_modified = #{gmtModified} ,</if>
 	  <if test="modifier != null">a.modifier = #{modifier},</if> 
-	  <if test="renewalsStutas != null">a.renewals_stutas = #{renewalsStutas} </if>
+	  <if test="renewalsStatus != null">a.renewals_status = #{renewalsStatus} </if>
 	  </trim>
 	  WHERE a.renewals_no = #{renewalsNo}
 </update>