退款接口修改？

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -45,7 +45,7 @@ import java.util.Date;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/wx/notify")
+@RequestMapping(Constants.OPEN_PREFIX + "/wx/notify")
 @Api(tags = {"【APP-微信回调】"})
 @Slf4j
 public class WxNotifyController {
@@ -57,7 +57,7 @@ public class WxNotifyController {
     private IWxJsOrderService wxJsOrderService;
 
     @Autowired
-    private  IRefundRecordService  refundRecordService;
+    private IRefundRecordService refundRecordService;
 
     @Autowired
     private AutoUpdateCertificatesVerifier verifier;
@@ -82,7 +82,7 @@ public class WxNotifyController {
     @ApiOperation("微信支付回调")
     public WxNotifyReturnDTO wxpayNotify(@RequestBody WxpayNotifyDTO wxpayNotifyDTO, HttpServletRequest request) throws GeneralSecurityException, IOException {
         String bodyString = getBodyString(request);
-        if (!validate(request,bodyString)){
+        if (!validate(request, bodyString)) {
             throw new CustomException("签名失败");
         }
         String resourceString = getSourString(wxpayNotifyDTO);
@@ -98,41 +98,31 @@ public class WxNotifyController {
     }
 
     private String getBodyString(HttpServletRequest request) {
-            BufferedReader br = null;
-            StringBuilder sb = new StringBuilder("");
-            try
-            {
-                br = request.getReader();
-                String str;
-                while ((str = br.readLine()) != null)
-                {
-                    sb.append(str);
-                }
-                br.close();
-            }
-            catch (IOException e)
-            {
-                e.printStackTrace();
+        BufferedReader br = null;
+        StringBuilder sb = new StringBuilder("");
+        try {
+            br = request.getReader();
+            String str;
+            while ((str = br.readLine()) != null) {
+                sb.append(str);
             }
-            finally
-            {
-                if (null != br)
-                {
-                    try
-                    {
-                        br.close();
-                    }
-                    catch (IOException e)
-                    {
-                        e.printStackTrace();
-                    }
+            br.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (null != br) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
             }
-            return sb.toString();
+        }
+        return sb.toString();
 
     }
 
-    private Boolean validate(HttpServletRequest request, String bodyString) throws  NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+    private Boolean validate(HttpServletRequest request, String bodyString) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
         String sign = request.getHeader("Wechatpay-Signature");
         String timestamp = request.getHeader("Wechatpay-Timestamp");
         String nonce = request.getHeader("Wechatpay-Nonce");
@@ -149,7 +139,7 @@ public class WxNotifyController {
         // 把我们构造的验签名串更新到签名器中
         signature.update(sb.toString().getBytes(StandardCharsets.UTF_8));
         Boolean result = signature.verify(Base64Utils.decodeFromString(sign));
-        log.info("微信支付回调验签:"+result.toString());
+        log.info("微信支付回调验签:" + result.toString());
         return result;
 
     }
@@ -162,14 +152,14 @@ public class WxNotifyController {
     @ApiOperation("微信退款回调")
     public WxNotifyReturnDTO refundNotify(@RequestBody WxpayNotifyDTO wxpayNotifyDTO, HttpServletRequest request) throws GeneralSecurityException, IOException {
         String bodyString = getBodyString(request);
-        if (!validate(request,bodyString)){
+        if (!validate(request, bodyString)) {
             throw new CustomException("签名失败");
         }
         String resourceString = getSourString(wxpayNotifyDTO);
         log.info(resourceString);
         JSONObject jsonObject = JSONObject.parseObject(resourceString);
         //将回调数据写入数据库
-        writeRefundNotifyDataToDb(jsonObject);
+        writeRefundNotifyDataToDb2(jsonObject);
 
         WxNotifyReturnDTO wxNotifyReturnDTO = new WxNotifyReturnDTO();
         wxNotifyReturnDTO.setCode("SUCCESS");
@@ -177,6 +167,11 @@ public class WxNotifyController {
         return wxNotifyReturnDTO;
     }
 
+
+    /**
+     * 原退款接口
+     * @param jsonObject
+     */
     private void writeRefundNotifyDataToDb(JSONObject jsonObject) {
         String refundId = jsonObject.getString("refund_id");
         String outTradeNo = jsonObject.getString("out_trade_no");
@@ -190,18 +185,18 @@ public class WxNotifyController {
         refundRecord.setStatus(jsonObject.getString("refund_status"));
         refundRecordService.updateById(refundRecord);
 
-        if("SUCCESS".equals(refundRecord.getStatus())){
+        if ("SUCCESS".equals(refundRecord.getStatus())) {
             //退款成功
-            long oneYearLong = 1000*60*60*24*365l;
-            WxJsOrder wxJsOrder= wxJsOrderService.getByOutTradeNo(outTradeNo);
-            if ("科目二视频".equals(wxJsOrder.getGoodsName())){
+            long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
+            WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo(outTradeNo);
+            if ("科目二视频".equals(wxJsOrder.getGoodsName())) {
                 GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
                 gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
                 GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
+                if (gv != null) {
                     //修改会员信息
                     Date km2Date = gv.getSubject2();
-                    if(km2Date!=null) {  //扣掉一年时间
+                    if (km2Date != null) {  //扣掉一年时间
                         long x = km2Date.getTime() - oneYearLong;
                         Date km2oneYear = new Date(x);
                         gv.setSubject2(km2oneYear);
@@ -212,30 +207,30 @@ public class WxNotifyController {
                 GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
                 gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
                 GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
+                if (gv != null) {
                     //修改会员信息
                     Date km3Date = gv.getSubject3();
-                    if(km3Date!=null) {  //扣掉一年时间
+                    if (km3Date != null) {  //扣掉一年时间
                         long x = km3Date.getTime() - oneYearLong;
                         Date km3oneYear = new Date(x);
                         gv.setSubject3(km3oneYear);
                         videoVipService.updateGzptVideoVipByUserId(gv);
                     }
                 }
-            }  else if ("全套实操视频".equals(wxJsOrder.getGoodsName())) {
+            } else if ("全套实操视频".equals(wxJsOrder.getGoodsName())) {
                 GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
                 gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
                 GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
+                if (gv != null) {
                     //修改会员信息
                     Date km2Date = gv.getSubject2();
                     Date km3Date = gv.getSubject3();
-                    if(km2Date!=null) {  //扣掉一年时间
+                    if (km2Date != null) {  //扣掉一年时间
                         long x = km2Date.getTime() - oneYearLong;
                         Date km2oneYear = new Date(x);
                         gv.setSubject2(km2oneYear);
                     }
-                    if(km3Date!=null) {  //扣掉一年时间
+                    if (km3Date != null) {  //扣掉一年时间
                         long x = km3Date.getTime() - oneYearLong;
                         Date km3oneYear = new Date(x);
                         gv.setSubject3(km3oneYear);
@@ -247,9 +242,116 @@ public class WxNotifyController {
     }
 
 
+    /**
+     * 新退款方便
+     * @param jsonObject
+     */
+    private void writeRefundNotifyDataToDb2(JSONObject jsonObject) {
+        String refundId = jsonObject.getString("refund_id");
+        String outTradeNo = jsonObject.getString("out_trade_no");
+        RefundRecord refundRecord = refundRecordService.getByRefundId(refundId);
+        if (refundRecord == null) {
+            log.error("该退款订单不存在");
+            return;
+        }
+        refundRecord.setTransactionId(jsonObject.getString("transaction_id"));
+        refundRecord.setUserReceivedAccount(jsonObject.getString("user_received_account"));
+        refundRecord.setStatus(jsonObject.getString("refund_status"));
+        refundRecordService.updateById(refundRecord);
 
+        if ("SUCCESS".equals(refundRecord.getStatus())) {
+            //退款成功
+            long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
+            WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo(outTradeNo);
+            if ("科一专项VIP".equals(wxJsOrder.getGoodsName())) {
+                UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+                if (userVip != null) {
+                    //修改会员信息
+                    Date km1Date = userVip.getSubject1();
+                    if (km1Date != null) {  //扣掉一年时间
+                        long x = km1Date.getTime() - oneYearLong;
+                        Date km1oneYear = new Date(x);
+                        userVip.setSubject1(km1oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                }
+            } else if ("科二专项VIP".equals(wxJsOrder.getGoodsName())) {
+                UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+                if (userVip != null) {
+                    //修改会员信息
+                    Date km2Date = userVip.getSubject2();
+                    if (km2Date != null) {  //扣掉一年时间
+                        long x = km2Date.getTime() - oneYearLong;
+                        Date km2oneYear = new Date(x);
+                        userVip.setSubject2(km2oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                }
+            } else if ("科三专项VIP".equals(wxJsOrder.getGoodsName())) {
+                UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+                if (userVip != null) {
+                    //修改会员信息
+                    Date km3Date = userVip.getSubject3();
+                    if (km3Date != null) {  //扣掉一年时间
+                        long x = km3Date.getTime() - oneYearLong;
+                        Date km3oneYear = new Date(x);
+                        userVip.setSubject3(km3oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                }
+            } else if ("科四专项VIP".equals(wxJsOrder.getGoodsName())) {
+                UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+                if (userVip != null) {
+                    //修改会员信息
+                    Date km4Date = userVip.getSubject4();
+                    if (km4Date != null) {  //扣掉一年时间
+                        long x = km4Date.getTime() - oneYearLong;
+                        Date km4oneYear = new Date(x);
+                        userVip.setSubject4(km4oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                }
+            } else if ("科目一二三四所有付费权益".equals(wxJsOrder.getGoodsName())) {
+                UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+                if (userVip != null) {
+                    //修改会员信息
+                    Date km1Date = userVip.getSubject1();
+                    Date km2Date = userVip.getSubject2();
+                    Date km3Date = userVip.getSubject3();
+                    Date km4Date = userVip.getSubject4();
+                    if (km1Date != null) {  //扣掉一年时间
+                        long x = km1Date.getTime() - oneYearLong;
+                        Date km1oneYear = new Date(x);
+                        userVip.setSubject1(km1oneYear);
+                    }
+                    if (km2Date != null) {  //扣掉一年时间
+                        long x = km2Date.getTime() - oneYearLong;
+                        Date km2oneYear = new Date(x);
+                        userVip.setSubject2(km2oneYear);
+                    }
+                    if (km3Date != null) {  //扣掉一年时间
+                        long x = km3Date.getTime() - oneYearLong;
+                        Date km3oneYear = new Date(x);
+                        userVip.setSubject3(km3oneYear);
+                    }
+                    if (km4Date != null) {  //扣掉一年时间
+                        long x = km4Date.getTime() - oneYearLong;
+                        Date km4oneYear = new Date(x);
+                        userVip.setSubject4(km4oneYear);
+                    }
+                    userVipService.updateById(userVip);
+                }
+            }
+            OrderInfo orderInfo = orderInfoService.getByOutTradeNo(outTradeNo);
+            try {
+                orderInfo.setOutRefundNo(refundRecord.getOutRefundNo());
+                orderInfoService.updateById(orderInfo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
 
-
+        }
+    }
 
 
     @Transactional
@@ -261,8 +363,8 @@ public class WxNotifyController {
             log.error("该订单不存在");
             return;
         }
-        if("SUCCESS".equals(wxJsOrder.getTradeState())){
-            log.info("订单号为"+wxJsOrder.getOutTradeNo()+"的订单已完成操作，无法重复操作！");
+        if ("SUCCESS".equals(wxJsOrder.getTradeState())) {
+            log.info("订单号为" + wxJsOrder.getOutTradeNo() + "的订单已完成操作，无法重复操作！");
             return;
         }
         wxJsOrder.setTransactionId(jsonObject.getString("transaction_id"));
@@ -273,7 +375,7 @@ public class WxNotifyController {
         wxJsOrder.setPayerCurrency(amount.getString("payer_currency"));
         wxJsOrder.setTradeState(jsonObject.getString("trade_state"));
         wxJsOrder.setBankType(jsonObject.getString("bank_type"));
-        DateTime dateTime  = new DateTime(jsonObject.getString("success_time"));
+        DateTime dateTime = new DateTime(jsonObject.getString("success_time"));
         wxJsOrder.setSuccessTime(dateTime.toDate());
         wxJsOrder.setTradeStateDesc(jsonObject.getString("trade_state_desc"));
         wxJsOrder.setTradeType(jsonObject.getString("trade_type"));
@@ -284,145 +386,141 @@ public class WxNotifyController {
         writeVipDataToDb2(wxJsOrder);
         wxJsOrderService.updateById(wxJsOrder);
 
-        //插入订单主表
-        OrderInfo orderInfo = new OrderInfo();
-        orderInfo.setGoodsName(wxJsOrder.getGoodsName());
-        orderInfo.setUserId(wxJsOrder.getUserId());
-        orderInfo.setOutTradeNo(wxJsOrder.getOutTradeNo());
-        orderInfo.setTradeType(1);
-        orderInfo.setSuccessTime(wxJsOrder.getSuccessTime());
-        orderInfo.setPayType(1);
-        orderInfo.setCreateTime(new Date());
-        orderInfoService.save(orderInfo);
-
     }
 
 
-
     @Transactional
     public void writeVipDataToDb(WxJsOrder wxJsOrder) {
-        long oneYearLong = 1000*60*60*24*365l;
+        long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
         Date now = new Date();
 
-        if ("科目二视频".equals(wxJsOrder.getGoodsName())){
-                GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
-                gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
-                GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
-                    //修改会员信息
-                    Date km2Date = gv.getSubject2();
-                    if(km2Date!=null) {  //存在会员时间
-                        if(km2Date.compareTo(now)<0) {  //会员已过期
-                            long x = now.getTime() + oneYearLong;
-                            Date km2oneYear = new Date(x);
-                            gv.setSubject2(km2oneYear);
-                            videoVipService.updateGzptVideoVipByUserId(gv);
-                        } else {  //会员时间延长
-                            long x = km2Date.getTime() + oneYearLong;
-                            Date km2oneYear = new Date(x);
-                            gv.setSubject2(km2oneYear);
-                            videoVipService.updateGzptVideoVipByUserId(gv);
-                        }
-                    } else {
+        if ("科目二视频".equals(wxJsOrder.getGoodsName())) {
+            GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
+            gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
+            GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
+            if (gv != null) {
+                //修改会员信息
+                Date km2Date = gv.getSubject2();
+                if (km2Date != null) {  //存在会员时间
+                    if (km2Date.compareTo(now) < 0) {  //会员已过期
                         long x = now.getTime() + oneYearLong;
                         Date km2oneYear = new Date(x);
                         gv.setSubject2(km2oneYear);
                         videoVipService.updateGzptVideoVipByUserId(gv);
+                    } else {  //会员时间延长
+                        long x = km2Date.getTime() + oneYearLong;
+                        Date km2oneYear = new Date(x);
+                        gv.setSubject2(km2oneYear);
+                        videoVipService.updateGzptVideoVipByUserId(gv);
                     }
                 } else {
-                    //新增会员信息
-                    GzptVideoVip videoVip = new GzptVideoVip();
-                    videoVip.setUserId(wxJsOrder.getUserId());
-                    videoVip.setUserName(wxJsOrder.getUserName());
                     long x = now.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
-                    videoVip.setSubject2(km2oneYear);
-                    videoVipService.saveGzptVideoVip(videoVip);
+                    gv.setSubject2(km2oneYear);
+                    videoVipService.updateGzptVideoVipByUserId(gv);
                 }
+            } else {
+                //新增会员信息
+                GzptVideoVip videoVip = new GzptVideoVip();
+                videoVip.setUserId(wxJsOrder.getUserId());
+                videoVip.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km2oneYear = new Date(x);
+                videoVip.setSubject2(km2oneYear);
+                videoVipService.saveGzptVideoVip(videoVip);
+            }
 
-            } else if ("科目三视频".equals(wxJsOrder.getGoodsName())) {
-                GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
-                gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
-                GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
-                    //修改会员信息
-                    Date km3Date = gv.getSubject3();
-                    if(km3Date!=null) {  //存在会员时间
-                        if(km3Date.compareTo(now)<0) {  //会员已过期
-                            long x = now.getTime() + oneYearLong;
-                            Date km3oneYear = new Date(x);
-                            gv.setSubject3(km3oneYear);
-                            videoVipService.updateGzptVideoVipByUserId(gv);
-                        } else {  //会员时间延长
-                            long x = km3Date.getTime() + oneYearLong;
-                            Date km3oneYear = new Date(x);
-                            gv.setSubject3(km3oneYear);
-                            videoVipService.updateGzptVideoVipByUserId(gv);
-                        }
-                    } else {
+        } else if ("科目三视频".equals(wxJsOrder.getGoodsName())) {
+            GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
+            gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
+            GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
+            if (gv != null) {
+                //修改会员信息
+                Date km3Date = gv.getSubject3();
+                if (km3Date != null) {  //存在会员时间
+                    if (km3Date.compareTo(now) < 0) {  //会员已过期
                         long x = now.getTime() + oneYearLong;
                         Date km3oneYear = new Date(x);
                         gv.setSubject3(km3oneYear);
                         videoVipService.updateGzptVideoVipByUserId(gv);
+                    } else {  //会员时间延长
+                        long x = km3Date.getTime() + oneYearLong;
+                        Date km3oneYear = new Date(x);
+                        gv.setSubject3(km3oneYear);
+                        videoVipService.updateGzptVideoVipByUserId(gv);
                     }
                 } else {
-                    //新增会员信息
-                    GzptVideoVip videoVip = new GzptVideoVip();
-                    videoVip.setUserId(wxJsOrder.getUserId());
-                    videoVip.setUserName(wxJsOrder.getUserName());
                     long x = now.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
-                    videoVip.setSubject3(km3oneYear);
-                    videoVipService.saveGzptVideoVip(videoVip);
+                    gv.setSubject3(km3oneYear);
+                    videoVipService.updateGzptVideoVipByUserId(gv);
                 }
+            } else {
+                //新增会员信息
+                GzptVideoVip videoVip = new GzptVideoVip();
+                videoVip.setUserId(wxJsOrder.getUserId());
+                videoVip.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km3oneYear = new Date(x);
+                videoVip.setSubject3(km3oneYear);
+                videoVipService.saveGzptVideoVip(videoVip);
+            }
 
-            }  else if ("全套实操视频".equals(wxJsOrder.getGoodsName())) {
-                GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
-                gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
-                GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
-                if(gv!=null) {
-                    //修改会员信息
-                    Date km2Date = gv.getSubject2();
-                    Date km3Date = gv.getSubject3();
-                    if(km2Date!=null) { //科目二处理
-                        long x = km2Date.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        gv.setSubject2(km2oneYear);
-                    } else {
-                        long x = now.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        gv.setSubject2(km2oneYear);
-                    }
-                    if(km3Date!=null) { //科目三处理
-                        long x = km3Date.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        gv.setSubject3(km3oneYear);
-                    } else {
-                        long x = now.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        gv.setSubject3(km3oneYear);
-                    }
-                    videoVipService.updateGzptVideoVipByUserId(gv);
+        } else if ("全套实操视频".equals(wxJsOrder.getGoodsName())) {
+            GzptVideoVipDTO gzptVideoVipDTO = new GzptVideoVipDTO();
+            gzptVideoVipDTO.setUserId(wxJsOrder.getUserId());
+            GzptVideoVip gv = videoVipService.getGzptVideoVipByUserIdForLocal(gzptVideoVipDTO);
+            if (gv != null) {
+                //修改会员信息
+                Date km2Date = gv.getSubject2();
+                Date km3Date = gv.getSubject3();
+                if (km2Date != null) { //科目二处理
+                    long x = km2Date.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    gv.setSubject2(km2oneYear);
                 } else {
-                    //新增会员信息
-                    GzptVideoVip videoVip = new GzptVideoVip();
-                    videoVip.setUserId(wxJsOrder.getUserId());
-                    videoVip.setUserName(wxJsOrder.getUserName());
                     long x = now.getTime() + oneYearLong;
-                    Date oneYear = new Date(x);
-                    videoVip.setSubject2(oneYear);
-                    videoVip.setSubject3(oneYear);
-                    videoVipService.saveGzptVideoVip(videoVip);
+                    Date km2oneYear = new Date(x);
+                    gv.setSubject2(km2oneYear);
                 }
+                if (km3Date != null) { //科目三处理
+                    long x = km3Date.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    gv.setSubject3(km3oneYear);
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    gv.setSubject3(km3oneYear);
+                }
+                videoVipService.updateGzptVideoVipByUserId(gv);
+            } else {
+                //新增会员信息
+                GzptVideoVip videoVip = new GzptVideoVip();
+                videoVip.setUserId(wxJsOrder.getUserId());
+                videoVip.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date oneYear = new Date(x);
+                videoVip.setSubject2(oneYear);
+                videoVip.setSubject3(oneYear);
+                videoVipService.saveGzptVideoVip(videoVip);
+            }
         }
     }
 
 
-
     @Transactional
     public void writeVipDataToDb2(WxJsOrder wxJsOrder) {
         long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
         Date now = new Date();
+        OrderInfo orderInfo = new OrderInfo();
+        orderInfo.setGoodsName(wxJsOrder.getGoodsName());
+        orderInfo.setUserId(wxJsOrder.getUserId());
+        orderInfo.setOutTradeNo(wxJsOrder.getOutTradeNo());
+        orderInfo.setTotal(wxJsOrder.getTotal());
+        orderInfo.setTradeType(1);
+        orderInfo.setSuccessTime(wxJsOrder.getSuccessTime());
+        orderInfo.setPayType(1);
+
 
         if ("科一专项VIP".equals(wxJsOrder.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
@@ -434,18 +532,19 @@ public class WxNotifyController {
                         long x = now.getTime() + oneYearLong;
                         Date km1oneYear = new Date(x);
                         userVip.setSubject1(km1oneYear);
-                        userVipService.updateById(userVip);
                     } else {  //会员时间延长
                         long x = km1Date.getTime() + oneYearLong;
                         Date km1oneYear = new Date(x);
                         userVip.setSubject1(km1oneYear);
-                        userVipService.updateById(userVip);
                     }
+                    userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 } else {
                     long x = now.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                     userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 }
             } else {
                 //新增会员信息
@@ -456,6 +555,7 @@ public class WxNotifyController {
                 Date km1oneYear = new Date(x);
                 uv.setSubject1(km1oneYear);
                 userVipService.save(uv);
+                orderInfoService.save(orderInfo);
             }
 
         } else if ("科二专项VIP".equals(wxJsOrder.getGoodsName())) {
@@ -468,18 +568,19 @@ public class WxNotifyController {
                         long x = now.getTime() + oneYearLong;
                         Date km2oneYear = new Date(x);
                         userVip.setSubject2(km2oneYear);
-                        userVipService.updateById(userVip);
                     } else {  //会员时间延长
                         long x = km2Date.getTime() + oneYearLong;
                         Date km2oneYear = new Date(x);
                         userVip.setSubject2(km2oneYear);
-                        userVipService.updateById(userVip);
                     }
+                    userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 } else {
                     long x = now.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                     userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 }
             } else {
                 //新增会员信息
@@ -490,6 +591,7 @@ public class WxNotifyController {
                 Date km2oneYear = new Date(x);
                 uv.setSubject2(km2oneYear);
                 userVipService.save(uv);
+                orderInfoService.save(orderInfo);
             }
         } else if ("科三专项VIP".equals(wxJsOrder.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
@@ -501,18 +603,19 @@ public class WxNotifyController {
                         long x = now.getTime() + oneYearLong;
                         Date km3oneYear = new Date(x);
                         userVip.setSubject3(km3oneYear);
-                        userVipService.updateById(userVip);
                     } else {  //会员时间延长
                         long x = km3Date.getTime() + oneYearLong;
                         Date km3oneYear = new Date(x);
                         userVip.setSubject3(km3oneYear);
-                        userVipService.updateById(userVip);
                     }
+                    userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 } else {
                     long x = now.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                     userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 }
             } else {
                 //新增会员信息
@@ -523,6 +626,7 @@ public class WxNotifyController {
                 Date km3oneYear = new Date(x);
                 uv.setSubject3(km3oneYear);
                 userVipService.save(uv);
+                orderInfoService.save(orderInfo);
             }
 
         } else if ("科四专项VIP".equals(wxJsOrder.getGoodsName())) {
@@ -535,18 +639,19 @@ public class WxNotifyController {
                         long x = now.getTime() + oneYearLong;
                         Date km4oneYear = new Date(x);
                         userVip.setSubject4(km4oneYear);
-                        userVipService.updateById(userVip);
                     } else {  //会员时间延长
                         long x = km4Date.getTime() + oneYearLong;
                         Date km4oneYear = new Date(x);
                         userVip.setSubject4(km4oneYear);
-                        userVipService.updateById(userVip);
                     }
+                    userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 } else {
                     long x = now.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
                     userVipService.updateById(userVip);
+                    orderInfoService.save(orderInfo);
                 }
             } else {
                 //新增会员信息
@@ -557,17 +662,18 @@ public class WxNotifyController {
                 Date km4oneYear = new Date(x);
                 uv.setSubject4(km4oneYear);
                 userVipService.save(uv);
+                orderInfoService.save(orderInfo);
             }
 
-        }   else if ("科目一二三四所有付费权益".equals(wxJsOrder.getGoodsName())) {
+        } else if ("科目一二三四所有付费权益".equals(wxJsOrder.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if(userVip!=null) {
+            if (userVip != null) {
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if(km1Date!=null) { //科目一处理
+                if (km1Date != null) { //科目一处理
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -576,7 +682,7 @@ public class WxNotifyController {
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if(km2Date!=null) { //科目二处理
+                if (km2Date != null) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -585,7 +691,7 @@ public class WxNotifyController {
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if(km3Date!=null) { //科目三处理
+                if (km3Date != null) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -594,7 +700,7 @@ public class WxNotifyController {
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if(km4Date!=null) { //科目四处理
+                if (km4Date != null) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -604,6 +710,7 @@ public class WxNotifyController {
                     userVip.setSubject4(km4oneYear);
                 }
                 userVipService.updateById(userVip);
+                orderInfoService.save(orderInfo);
             } else {
                 //新增会员信息
                 UserVip uv = new UserVip();
@@ -616,12 +723,12 @@ public class WxNotifyController {
                 uv.setSubject3(oneYear);
                 uv.setSubject4(oneYear);
                 userVipService.updateById(uv);
+                orderInfoService.save(orderInfo);
             }
         }
     }
 
 
-
     private String getSourString(WxpayNotifyDTO wxpayNotifyDTO) throws GeneralSecurityException, IOException {
         AesUtil aesUtil = new AesUtil(wxpayConfig.getV3key().getBytes());
         WxpayNotifyDTO.WxpaySource wxpaySource = wxpayNotifyDTO.getResource();
@@ -629,8 +736,6 @@ public class WxNotifyController {
     }
 
 
-
-
     @Data
     public class FilmNotifyReturnDTO {
         String code;

jsjp-admin/src/main/resources/application-dev.yml

@@ -79,10 +79,6 @@ spring:
         # 指定库
         database: 4
 
-# 短信验证
-sms_user_name: "jsjp"
-sms_password: "t7nwh7"
-
 
 
 # 调用外部接口
@@ -90,7 +86,7 @@ feign:
     jgpt_ipport: http://localhost:8080/
     qgpt_ipport: http://114.55.58.112:8085/
 
-# 微信小程序
+# 极速驾培 微信开放平台
 app:
     appid: wx606fa102dbc4b8ab
     secret: 93832292771493dc2aae6797edbc387c
@@ -131,41 +127,8 @@ wxpay:
     v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
     notifyUrl: http://175.42.30.21:8888/open-api/wx/notify/wxpay
     notifyUrlRefund: http://175.42.30.21:8888/open-api/wx/notify/refund
-    appId: wx606fa102dbc4b8ab
-
-
-# 电影
-film:
-    appKey: 10000000000
-    appSecret: 25f9e794323b453885f5181f1b624d0b
-    notifyUrl: http://1.15.26.233:8080/jsjp-admin/open-api/film/notify/filmOrder
-    v1Url: http://movieapi-test.taototo.cn/
-    v2Url: http://movieapi2-test.taototo.cn/
-
-# 拼多多
-pdd:
-    clientId: "fa0f2debb5b0444b9719919d7b8204d1"
-    clientSecret: "3305b6bb37252495848e67fd991134651e308495"
-    pid: "1642187_203462988"
 
-# 美团联盟
-mei:
-    actId: "2"
-    key: "610077fffb51712efaa686d9ffb623da"
-    secret: "514202a9238958b16cb13805d6f79273"
-    sid: "jsshq001"
-    appId: "wxde8ac0a21135c07d"
 
-# 挖数据平台
-wai:
-    appid: "7629"
-    secret: "cce08fcab10ff96a863892bb6e396a9e"
 
 
 
-# 福禄平台
-fulu:
-    appKey: "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB"
-    appSecret: "0a091b3aa4324435aab703142518a8f7"
-    url: "http://pre.openapi.fulu.com"
-    notifyUrl: "http://1.15.26.233:8080/jsjp-admin/open-api/fulu/notify/fuluOrder"

jsjp-admin/src/main/resources/application-prodtest.yml

@@ -79,10 +79,6 @@ spring:
         # 指定库
         database: 4
 
-# 短信验证
-sms_user_name: "jsjp"
-sms_password: "t7nwh7"
-
 
 
 # 调用外部接口
@@ -90,7 +86,7 @@ feign:
     jgpt_ipport: http://localhost:8080/
     qgpt_ipport: http://114.55.58.112:8085/
 
-# 微信小程序
+# 极速驾培 微信开放平台
 app:
     appid: wx606fa102dbc4b8ab
     secret: 93832292771493dc2aae6797edbc387c
@@ -128,41 +124,7 @@ wxpay:
     merchantId: 1611324484
     serialNumber: 53EBF541F383371B121D7B57B25305FC0BB04F42
     v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
-    notifyUrl: http://218.85.55.253:8888/open-api/wx/notify/wxpay
-    notifyUrlRefund: http://218.85.55.253:8888/open-api/wx/notify/refund
-
-
-# 电影
-film:
-    appKey: 10294472736
-    appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
-    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
-    v1Url: http://movieapi.pintoto.cn/
-    v2Url: http://movieapi2.pintoto.cn/
-
-# 拼多多
-pdd:
-    clientId: "fa0f2debb5b0444b9719919d7b8204d1"
-    clientSecret: "3305b6bb37252495848e67fd991134651e308495"
-    pid: "1642187_203462988"
-
-# 美团联盟
-mei:
-    actId: "2"
-    key: "610077fffb51712efaa686d9ffb623da"
-    secret: "514202a9238958b16cb13805d6f79273"
-    sid: "jsshq001"
-    appId: "wxde8ac0a21135c07d"
-
-# 挖数据平台
-wai:
-    appid: "7629"
-    secret: "cce08fcab10ff96a863892bb6e396a9e"
+    notifyUrl: http://175.42.30.21:8888/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://175.42.30.21:8888/open-api/wx/notify/refund
 
 
-# 福禄平台
-fulu:
-    appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
-    appSecret: "a1be19d04c724c05971942305ea97489"
-    url: "http://openapi.fulu.com"
-    notifyUrl: "http://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"

jsjp-admin/src/test/java/com/miaxis/test/NewGzptTest.java

@@ -81,7 +81,7 @@ public class NewGzptTest {
 
     @Test
     public void test5() throws Exception {
-        WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo("12022032418011181183838613119074");
+        WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo("12022060714212752523480794758101");
         refundRecordService.refund(wxJsOrder, OrderCodeFactory.getOrderCode(null), "测试退款111BBQ");
     }
 

jsjp-service/src/main/java/com/miaxis/feign/service/IFuluService.java

@@ -1,26 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.fulu.FuluDTO;
-import com.miaxis.feign.dto.fulu.FuluResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
- *
- * 福禄开放接口
- */
-@FeignClient(name="fuluService",
-        url = "${fulu.url}",configuration = FeignConfig.class)
-@Component
-public interface IFuluService {
-    /**
-     *  通用接口
-     * @return
-     */
-    @GetMapping(value = "/api/getway",consumes = MediaType.APPLICATION_JSON_VALUE)
-    FuluResult fuluCommonApi(FuluDTO fuluDTO);
-}

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -19,4 +19,5 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
      */
     public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
 
+    OrderInfo getByOutTradeNo(String outTradeNo);
 }

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -18,4 +18,6 @@ public interface IOrderInfoService extends IService<OrderInfo>{
      * @return 订单信息集合
      */
     public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+
+    OrderInfo getByOutTradeNo(String outTradeNo);
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -33,4 +33,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo){
         return orderInfoMapper.selectOrderInfoList(orderInfo);
     }
+
+    @Override
+    public OrderInfo getByOutTradeNo(String outTradeNo) {
+        return orderInfoMapper.getByOutTradeNo(outTradeNo);
+    }
 }

jsjp-service/src/main/java/com/miaxis/sms/ISmsService.java

@@ -1,20 +0,0 @@
-package com.miaxis.sms;
-
-import com.miaxis.sms.domain.SmsParameter;
-import com.miaxis.common.core.domain.Response;
-
-/**
- * 短信服务层接口
- * @Author wwl
- * @Date 2020/12/23
- * @Version 1.0
- */
-public interface ISmsService {
-
-    /**
-     * 发送短信验证码
-     * @param smsParameter
-     * @return
-     */
-    Response sendVerificationCode(SmsParameter smsParameter);
-}

jsjp-service/src/main/java/com/miaxis/sms/domain/SmsParameter.java

@@ -1,30 +0,0 @@
-package com.miaxis.sms.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Author wwl
- * @Date 2020/12/29
- * @Version 1.0
- */
-@Data
-public class SmsParameter implements Serializable {
-
-    /** 手机号码 */
-    private String phone;
-
-    /** 发送短信类型（login:用户登录验证码、modify:修改手机验证码、signUp:注册报名验证码） */
-    private String type;
-
-    /** 缓存key前缀 */
-    private String keyPrefix;
-
-    /** 验证次数 */
-    private String verificationCount;
-
-    /** 短信模板 */
-    private String smsTemplateConstants;
-
-}

jsjp-service/src/main/java/com/miaxis/sms/impl/SmsServiceImpl.java

@@ -1,214 +0,0 @@
-package com.miaxis.sms.impl;
-
-import com.miaxis.sms.ISmsService;
-import com.miaxis.sms.domain.SmsParameter;
-import com.miaxis.common.constant.SmsTemplateConstants;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.sms.Client;
-import com.miaxis.common.utils.RedisPrefixUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * 短信服务层接口实现
- * @Author wwl
- * @Date 2020/12/23
- * @Version 1.0
- */
-@Service
-public class SmsServiceImpl implements ISmsService {
-
-    private final String MOBILE_REGEX = "^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9])|(19[0-9]))\\d{8}$";//手机号码验证
-    private final Integer SMS_MAX_COUNT = 500 ;//每天系统发送最大次数(预留)
-    private final Integer MAX_COUNT = 5 ;//每个手机号验证发送最大次数
-    private final long SEND_INTERVAL = 3 ;//发送间隔时间
-
-
-    @Value("${sms_user_name}")
-    private String smsUserName;//用户名
-
-    @Value("${sms_password}")
-    private String smsPassword;//密码
-
-    @Autowired
-    private RedisTemplate redisTemplate;//redis模板引擎
-
-    /**
-     * 发送短信验证码
-     * @param smsParameter
-     * @return
-     */
-    @Override
-    public Response sendVerificationCode(SmsParameter smsParameter) {
-        //字符编码
-        String charset = "UTF-8";
-
-        //type验证
-        List<String> collect = Arrays.stream(SmsTemplateConstants.SMS_TEMPLATE_TYPE)
-                .parallel()
-                .filter(str -> str.equals(smsParameter.getType()))
-                .collect(Collectors.toList());
-        if (collect.size()==0){
-            throw new CustomException("参数{type}类型错误!");
-        }
-
-        //手机号格式验证
-        if(smsParameter.getPhone().length() != 11){
-            throw new CustomException("手机格式错误!");
-        } else {
-            Pattern pattern = Pattern.compile(MOBILE_REGEX);
-            Matcher matcher = pattern.matcher(smsParameter.getPhone());
-            if(!matcher.matches()) {
-                throw new CustomException("手机号格式错误!");
-            }
-        }
-        try{
-
-            //生成redis 验证码key前缀 验证次数key前缀
-            String smsKeyPrefix = RedisPrefixUtils.getSmsKeyPrefix(smsParameter.getType(), smsParameter.getPhone());
-            String smsKeyCountPrefix = RedisPrefixUtils.getSmsKeyCountPrefix(smsParameter.getType(), smsParameter.getPhone());
-            smsParameter.setKeyPrefix(smsKeyPrefix);
-            smsParameter.setVerificationCount(smsKeyCountPrefix);
-
-            if ("login".equals(smsParameter.getType())){
-                smsParameter.setSmsTemplateConstants(SmsTemplateConstants.LOGIN);
-            }
-            if ("signUp".equals(smsParameter.getType())){
-                smsParameter.setSmsTemplateConstants(SmsTemplateConstants.SIGNUP);
-            }
-            if ("modify".equals(smsParameter.getType())){
-                smsParameter.setSmsTemplateConstants(SmsTemplateConstants.MODIFY);
-            }
-
-            //验证缓存信息
-            Response resultJson = validateMobile(smsParameter);
-            if("500".equals(resultJson.getCode().toString())) {
-                return resultJson;
-            }
-
-            // 生成验证码
-            String code="";
-            for (int i=0;i<6;i++){
-                code += new Random().nextInt(10);
-            }
-            String content = smsParameter.getSmsTemplateConstants().replace("code",code);
-
-            // 调用发送接口
-            Client client = new Client(smsUserName, smsPassword);
-            String content1 = URLEncoder.encode(content, charset);
-            String ecodeContent = URLEncoder.encode(content1, charset);
-            String result = client.mtData(ecodeContent, smsParameter.getPhone(), "", "", "", charset);
-            String strCode = result.split("\n")[0];
-            long codenum = 0;
-            codenum = Long.valueOf(strCode);
-            String Info = null;
-            if (codenum > 0) {//成功提交
-                Info = "发送成功";
-                // 写入缓存中
-                writeCache(code,smsParameter);
-                return Response.success(Info);
-
-            } else if (codenum == 0) {
-                Info = "发送失败";
-            } else if (codenum == -1) { // 用户名密码不正确
-                Info = "用户名密码不正确";
-            } else if (codenum == -2) { // 必填选项为空
-                Info = "必填选项为空";
-            } else if (codenum == -3) { // 短信内容0个字节
-                Info = "短信内容0个字节";
-            } else if (codenum == -4) { // 0个有效号码
-                Info = "0个有效号码";
-            } else if (codenum == -5) { // 余额不够
-                Info = "余额不够";
-            } else if (codenum == -10) { // 用户被禁用
-                Info = "用户被禁用";
-            } else if (codenum == -11) { // 短信内容过长
-                Info = "短信内容过长";
-            } else if(codenum == -12){	 //用户无扩展权限
-                Info = "无扩展权限";
-            } else if(codenum == -13){  //IP地址校验错
-                Info = "IP校验错误";
-            } else if(codenum == -14){  //内容解析异常
-                Info = "内容解析异常";
-            } else {
-                Info = "未知错误";
-            }
-
-            throw new CustomException(Info);
-        } catch (Exception e) {
-            throw new CustomException(e.getMessage());
-        }
-    }
-
-
-    /**
-     * 手机号验证
-     * keyPrefix : 缓存key前缀
-     * verificationCount : 验证次数
-     * @param smsParameter
-     * @return
-     */
-    private Response validateMobile(SmsParameter smsParameter){
-
-        if(redisTemplate.hasKey(smsParameter.getVerificationCount())){
-            // 验证发送时间
-            if (redisTemplate.hasKey(smsParameter.getKeyPrefix())){
-                throw new CustomException("验证码还未过期，不能重新发送!",500);
-            }
-
-            // 验证发送次数
-            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(smsParameter.getVerificationCount()).toString());
-            if(count >= MAX_COUNT) {
-                throw new CustomException("当前手机号发送验证码次数过多!",500);
-            }
-        }
-        return Response.success();
-    }
-
-
-    /**
-     * 写入缓存
-     * @param smsParameter
-     * @param code
-     */
-    private void writeCache(String code,SmsParameter smsParameter){
-
-        //该手机号首次获取验证码
-        if(!redisTemplate.hasKey(smsParameter.getKeyPrefix()) && !redisTemplate.hasKey(smsParameter.getVerificationCount())){
-            synchronized(this){
-                //设置该手机号验证码 两分钟过期
-                redisTemplate.opsForValue().set(smsParameter.getKeyPrefix() , code, SEND_INTERVAL, TimeUnit.MINUTES);
-                //设置该手机号验证次数 一天过期
-                redisTemplate.opsForValue().set(smsParameter.getVerificationCount() , "1",1,TimeUnit.DAYS);
-            }
-        }
-
-        //多次获取验证码
-        if (redisTemplate.hasKey(smsParameter.getVerificationCount()) && !redisTemplate.hasKey(smsParameter.getKeyPrefix())){
-            //判断该手机验证次数
-            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(smsParameter.getVerificationCount()).toString());
-            if (count < MAX_COUNT){
-                synchronized(this){
-                    //该手机号验证次数+1 一天过期
-                    redisTemplate.opsForValue().set(smsParameter.getVerificationCount() ,String.valueOf(count+1),1,TimeUnit.DAYS);
-                    //设置该手机号验证码 两分钟过期
-                    redisTemplate.opsForValue().set(smsParameter.getKeyPrefix() , code, SEND_INTERVAL, TimeUnit.MINUTES);
-                }
-            }
-        }
-    }
-
-
-}

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.order.mapper.OrderInfoMapper">
+
+    <resultMap type="OrderInfo" id="OrderInfoResult">
+        <result property="id"    column="id"    />
+        <result property="goodsName"    column="goods_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="outTradeNo"    column="out_trade_no"    />
+        <result property="outRefundNo"    column="out_refund_no"    />
+        <result property="tradeType"    column="trade_type"    />
+        <result property="successTime"    column="success_time"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectOrderInfoVo">
+        select * from order_info
+    </sql>
+
+    <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
+        <include refid="selectOrderInfoVo"/>
+        <where>
+            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
+            <if test="outRefundNo != null  and outRefundNo != ''"> and out_refund_no = #{outRefundNo}</if>
+            <if test="tradeType != null  and tradeType != ''"> and trade_type = #{tradeType}</if>
+            <if test="successTime != null "> and success_time = #{successTime}</if>
+            <if test="payType != null "> and pay_type = #{payType}</if>
+        </where>
+    </select>
+
+
+    <select id="getByOutTradeNo" parameterType="string" resultType="com.miaxis.order.domain.OrderInfo">
+        select * from order_info where out_trade_no =#{outTradeNo}
+    </select>
+
+</mapper>

jsjp-service/src/main/resources/mapper/userInfo/UserVipMapper.xml

@@ -45,4 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+
+
 </mapper>