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

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

@@ -222,7 +222,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
         }
         //修改续费状态
-        res = userRenewalsFacade.updateRenewalStutas(userRenewals);
+        res = userRenewalsFacade.updateRenewalStatus(userRenewals);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
         }

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

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,21 +44,26 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
     private UserServiceClient userServiceClient;
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private OpenedProductsFacade openedProductsFacade;
 
     public RespDTO<Boolean> addRenewalsInfos(AddRenewalsInfoVO addRenewalsInfoVO){
         UserRenewals userRenewals =new UserRenewals();
+        Map map =new HashMap();
         String user = UserUtils.getCurrentPrincipleID();
+        map.put("productId",addRenewalsInfoVO.getProductId());
+        map.put("userId",user);
         Long userId = Long.parseLong(user);
         userRenewals.setCreator(user);
         userRenewals.setUserId(userId);
         userRenewals.setApplyTime(DateUtil.now());
         userRenewals.setGmtCreate(DateUtil.now());
         userRenewals.setRenewalsNo(visibleIdCreater.getNextId(VisibleIdTypeEnum.IS_RENEWALS.getKey()).toString());
-        List<Long> productId =this.selectProductIdByUserId(userId);
-        for(int i =0 ; i < productId.size(); i++){
-            if(productId.get(i).longValue() == addRenewalsInfoVO.getProductId().longValue()){
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交申请");
-            }
+        if(openedProductsFacade.selectOpenedProducts(map).size() == 0){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该产品未开通，不能续费");
+        }
+        if(this.selectProductIdByUserId(map).contains(addRenewalsInfoVO.getProductId())){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交申请");
         }
         userRenewals.setProductId(addRenewalsInfoVO.getProductId());
         return RespDTO.onSuc(this.save(userRenewals));
@@ -107,6 +113,8 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
     public Boolean deleteRenewalsInfo(DeleteRenewalsInfoVO deleteRenewalsInfoVO){
         UserRenewals userRenewals =this.getById(deleteRenewalsInfoVO.getId());
         userRenewals.setIsDeleted("Y");
+        userRenewals.setModifier(UserUtils.getCurrentPrincipleID());
+        userRenewals.setGmtModified(DateUtil.now());
         if(!this.updateById(userRenewals)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "删除失败");
@@ -117,6 +125,8 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
     public Boolean cancelRenewalsInfo(DeleteRenewalsInfoVO deleteRenewalsInfoVO){
         UserRenewals userRenewals =this.getById(deleteRenewalsInfoVO.getId());
         userRenewals.setCancelRenewals(CancelRenewalsEnum.CANCEL_RENEWALS_ENUM.getKey());
+        userRenewals.setModifier(UserUtils.getCurrentPrincipleID());
+        userRenewals.setGmtModified(DateUtil.now());
         if(!this.updateById(userRenewals)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "取消失败");

diagbotman-service/src/main/java/com/diagbot/mapper/UserRenewalsMapper.java

@@ -9,6 +9,7 @@ import com.diagbot.entity.wrapper.UserRenewalsWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,10 +22,10 @@ import java.util.List;
 public interface UserRenewalsMapper extends BaseMapper<UserRenewals> {
     /**
      * 根据用户id查询用户提交续费申请的产品id
-     * @param userId
+     * @param map
      * @return
      */
-    public List<Long> selectProductIdByUserId(Long userId);
+    public List<Long> selectProductIdByUserId(@Param("map") Map<String,Long> map);
 
     /**
      * 查询续费相关信息系
@@ -34,17 +35,11 @@ public interface UserRenewalsMapper extends BaseMapper<UserRenewals> {
      */
     public IPage<RenewalsInfosDTO> selectUserRenewals(Page page,@Param("renewalsInfosVO") UserRenewalsWrapper userRenewalsWrapper);
 
-    /**
-     * 根据续费id删除续费信息
-     * @param id
-     * @return
-     */
-    public int deleteUserRenewals(Long id);
     
     /**
      * 根据续费单号修改续费状态
      * @param userRenewals
      * @return
      */
-    public boolean updateRenewalStutas(UserRenewals userRenewals);
+    public boolean updateRenewalStatus(UserRenewals userRenewals);
 }

diagbotman-service/src/main/java/com/diagbot/service/UserRenewalsService.java

@@ -8,6 +8,7 @@ import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,10 +22,10 @@ public interface UserRenewalsService extends IService<UserRenewals> {
 
     /**
      * 根据用户id查询用户提交续费申请的产品id
-     * @param userId
+     * @param map
      * @return
      */
-    public List<Long> selectProductIdByUserId(Long userId);
+    public List<Long> selectProductIdByUserId(Map map);
 
     /**
      * 查询续费相关信息系
@@ -34,16 +35,11 @@ public interface UserRenewalsService extends IService<UserRenewals> {
      */
     public IPage<RenewalsInfosDTO> selectUserRenewals(Page page,UserRenewalsWrapper userRenewalsWrapper);
 
-    /**
-     * 根据续费id删除续费信息
-     * @param id
-     * @return
-     */
-    public Boolean deleteUserRenewals(Long id);
+
     /**
      * 根据续费单号修改续费状态
      * @param userRenewals
      * @return
      */
-    public boolean updateRenewalStutas(UserRenewals userRenewals);
+    public boolean updateRenewalStatus(UserRenewals userRenewals);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/UserRenewalsServiceImpl.java

@@ -11,7 +11,9 @@ import com.diagbot.service.UserRenewalsService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,8 +27,8 @@ import java.util.List;
 public class UserRenewalsServiceImpl extends ServiceImpl<UserRenewalsMapper, UserRenewals> implements UserRenewalsService {
 
     @Override
-    public List<Long> selectProductIdByUserId(Long userId) {
-        return baseMapper.selectProductIdByUserId(userId);
+    public List<Long> selectProductIdByUserId(Map map) {
+        return baseMapper.selectProductIdByUserId(map);
     }
 
     @Override
@@ -34,14 +36,9 @@ public class UserRenewalsServiceImpl extends ServiceImpl<UserRenewalsMapper, Use
         return baseMapper.selectUserRenewals(page,userRenewalsWrapper);
     }
 
-    @Override
-    public Boolean deleteUserRenewals(Long id) {
-        return baseMapper.deleteUserRenewals(id)==1 ? true:false;
-    }
-
 	@Override
-	public boolean updateRenewalStutas(UserRenewals userRenewals) {
+	public boolean updateRenewalStatus(UserRenewals userRenewals) {
 		// TODO Auto-generated method stub
-		return baseMapper.updateRenewalStutas(userRenewals);
+		return baseMapper.updateRenewalStatus(userRenewals);
 	}
 }

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

@@ -18,8 +18,15 @@
         <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_status = 0 AND r.user_id =#{userId}
+    <select id="selectProductIdByUserId" resultType="java.util.Map">
+        SELECT r.product_id FROM `diag_user_renewals` r WHERE r.is_deleted = 'N'
+        <if test="map.userId != null and map.userId != ''">
+            AND r.user_id =#{map.userId}
+        </if>
+        <if test="map.productId != null and map.productId != ''">
+            AND r.product_id#{map.productId}
+        </if>
+         and r.renewals_status = 0  AND r.cancel_renewals = 0
     </select>
 
     <select id="selectUserRenewals" resultType="com.diagbot.dto.RenewalsInfosDTO">
@@ -40,11 +47,7 @@
         </if>
         ORDER BY apply_time DESC
     </select>
-    
-    <update id="deleteUserRenewals">
-        UPDATE `diag_user_renewals` SET `cancel_renewals`=#{cancelRenewals} WHERE (`id`=#{id})
-    </update>
-    
+
     <update id="updateRenewalStatus" parameterType="com.diagbot.entity.UserRenewals">
 	UPDATE 
 	 diag_user_renewals a