修改充值接口

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java

@@ -38,10 +38,17 @@ public interface RefillCardMapper extends BaseMapper<RefillCardMapper> {
 
     /**
      * 通过ID查询充值卡信息
-     * @param id
-     * @return
+     * @param id 主键
+     * @return 充值卡信息
      */
     RefillCard getById(@Param("id") Integer id);
 
     int setIsMakeCard(@Param("id") Integer id);
+
+    /**
+     * 通过批次号查询充值卡信息
+     * @param batchNumber 批次号
+     * @return 充值卡信息
+     */
+    RefillCard getByBatchNumber(@Param("batchNumber") String batchNumber);
 }

wisenergy-mapper/src/main/resources/mapper/CardMapper.xml

@@ -90,7 +90,6 @@
         <include refid="table"/>
         <where>
             secret_key=#{secretKey}
-            and status=0
             and is_delete=0
         </where>
     </select>

wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml

@@ -99,6 +99,14 @@
         where id=#{id}
     </select>
 
+    <select id="getByBatchNumber" resultType="cn.wisenergy.model.app.RefillCard">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where batch_number=#{batchNumber}
+    </select>
+
     <update id="setIsMakeCard">
         UPDATE
         <include refid="table"/>

wisenergy-model/src/main/java/cn/wisenergy/model/app/RefillCard.java

@@ -19,7 +19,7 @@ public class RefillCard {
      * 批次号
      */
     @ApiModelProperty(value = "批次号",name = "batchNumber")
-    private String batchNumber;
+    private String isActivate;
 
     /**
      * 是否已制卡 0：已制卡 1：未制卡

wisenergy-model/src/main/java/cn/wisenergy/model/enums/CardStatus.java

@@ -8,10 +8,10 @@ package cn.wisenergy.model.enums;
 
 public enum CardStatus {
     //未使用
-    NO_USE(1, "未使用"),
+    NO_USE(0, "未使用"),
 
     //已使用
-    ALREADY_USED(2, "已使用");
+    ALREADY_USED(1, "已使用");
     private Integer code;
 
     private String desc;

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSms.java

-package cn.wisenergy.service.app.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SendSms {
-    public static void main(String[] args) {
-        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAIuFVMscvCNpMU", "AvotjHvvGzEm8sX9vZaUhVypnZfUk7");
-        IAcsClient client = new DefaultAcsClient(profile);
-
-        CommonRequest request = new CommonRequest();
-        request.setSysMethod(MethodType.POST);
-        request.setSysDomain("dysmsapi.aliyuncs.com");
-        request.setSysVersion("2017-05-25");
-        request.setSysAction("SendSms");
-        Map<String,Object> map=new HashMap<>();
-        map.put("code",123456);
-        request.putQueryParameter("RegionId", "cn-hangzhou");
-        request.putQueryParameter("PhoneNumbers", "18757121665");
-        request.putQueryParameter("SignName", "遵义群智科技有限公司");
-        request.putQueryParameter("TemplateCode", "SMS_157970381");
-        request.putQueryParameter("TemplateParam", JSON.toJSONString(map));
-        try {
-            CommonResponse response = client.getCommonResponse(request);
-            System.out.println(response.getData());
-        } catch (ClientException e) {
-            e.printStackTrace();
-        }
-    }
-}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java

@@ -3,6 +3,7 @@ package cn.wisenergy.service.app.impl;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
+import cn.wisenergy.model.enums.CardStatus;
 import cn.wisenergy.model.enums.PayType;
 import cn.wisenergy.model.vo.AddLimitVo;
 import cn.wisenergy.service.app.UserLimitService;
@@ -39,6 +40,9 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
     @Autowired
     private VolunteerManager volunteerManager;
 
+    @Autowired
+    private RefillCardMapper refillCardMapper;
+
     @Override
     public R<UserLimit> getByUserId(Integer userId) {
         log.info("volunteer-service[]UserLimitServiceImpl[]getByUserId[]input.param.userId:" + userId);
@@ -71,13 +75,27 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
         //1、充值卡
         if (PayType.REFILL_CARD.getCode().equals(addLimitVo.getPayType())) {
             if (StringUtils.isBlank(addLimitVo.getPassword())) {
-                return R.error("充值卡密码不能为空!");
+                return R.error(1,"充值卡密码不能为空!",false);
             }
 
             //根据密码获取充值卡信息
             CardInfo cardInfo = cardMapper.getBySecretKey(addLimitVo.getPassword());
-            if (null == cardInfo) {
-                return R.error("充值卡信息不存在!");
+            if (null == cardInfo || StringUtils.isBlank(cardInfo.getBatchNumber())) {
+                return R.error(1,"充值卡信息不存在!",false);
+            }
+
+            if (cardInfo.getStatus().equals(CardStatus.ALREADY_USED.getCode())) {
+                return R.error(0,"充值卡已使用，请购买新卡!",false);
+            }
+
+            //获取主卡信息
+            RefillCard refillCard = refillCardMapper.getByBatchNumber(cardInfo.getBatchNumber());
+            if (null == refillCard) {
+                return R.error(1,"充值卡信息不存在!",false);
+            }
+
+            if (refillCard.getIsActivite() == 1) {
+                return R.error(1,"充值卡未激活，请联系管理员激活!",false);
             }
 
             //增加用户可用查询次数
@@ -95,7 +113,7 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
         } else {
             //2、微信或者支付宝
             if (null == addLimitVo.getPayMoney()) {
-                return R.error("支付金额不能为空!");
+                return R.error(1,"支付金额不能为空!",false);
             }
 
             //根据支付的金额，查询用户新增查询次数