bugfix

src/main/java/com/caimei365/order/components/HeliPayUtil.java

@@ -271,7 +271,6 @@ public class HeliPayUtil {
             pay.setP11_callbackUrl(heliDto.getReturnUrl());
             pay.setP13_orderIp(headers.getFirst("X-CLIENT-IP"));
             pay.setP14_onlineCardType("DEBIT");
-//            pay.setP17_signatureType("MD5");
         } catch (UnsupportedEncodingException e) {
             log.error("网银支付设值错误=================>"+e);
         }

src/main/java/com/caimei365/order/model/enums/PayType.java

@@ -0,0 +1,56 @@
+package com.caimei365.order.model.enums;
+
+/**
+ * @author 5566
+ * @version 1.0
+ * @date 2020-02-12 17:33
+ * @desc
+ */
+public enum PayType {
+    /**
+     * 刷卡/被扫
+     */
+    SWIPE("刷卡", 1),
+    /**
+     * 动态码/主扫
+     */
+    SCAN("扫码", 2),
+    /**
+     * h5/wap
+     */
+    WAP("WAP", 3),
+    /**
+     * 微信公众号即服务号:必须配置appid及授权目录,关注appid非必须配
+     * 支付宝服务窗无需配置
+     * 银联js无需配置
+     */
+    PUBLIC("公众号支付", 4),
+    /**
+     * 微信sdk-app模式:必须配置appid,授权目录无需配置,关注appid无需配置
+     * 支付宝app
+     */
+    SDK("SDK", 5),
+    /**
+     * 微信小程序:必须配置appid,授权目录无需配置,关注appid非必须配
+     * 支付宝小程序无需配置
+     */
+    APPLET("小程序", 6),
+    ;
+
+    PayType(String s, Integer i) {
+        this.desc = s;
+        this.index = i;
+    }
+
+
+    private String desc;
+    private Integer index;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public Integer getIndex() {
+        return index;
+    }
+}

src/main/java/com/caimei365/order/model/enums/ProductType.java

@@ -0,0 +1,21 @@
+package com.caimei365.order.model.enums;
+
+public enum ProductType {
+
+    APPPAY("扫码"),
+    ONLINE("网银"),
+    QUICKPAY("快捷"),
+
+
+
+    ;
+    private final String desc;
+
+    ProductType(String desc) {
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/caimei365/order/service/impl/HeliPayNonOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.caimei365.order.model.bo.VipRecordBo;
 import com.caimei365.order.model.dto.HeliDto;
 import com.caimei365.order.model.enums.AccountPayOrderType;
 import com.caimei365.order.model.enums.AppPayType;
+import com.caimei365.order.model.enums.PayType;
 import com.caimei365.order.model.po.DiscernReceiptPo;
 import com.caimei365.order.model.po.OrderReceiptRelationPo;
 import com.caimei365.order.model.po.SplitAccountPo;

src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -26,9 +26,9 @@ import com.caimei365.order.utils.helipay.HttpClientService;
 import com.caimei365.order.utils.helipay.MyBeanUtils;
 import com.caimei365.order.utils.pay.RSAUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
@@ -344,22 +344,21 @@ public class HeliPayServiceImpl implements HeliPayService {
         }
         if (rechargeFlag > 0) {
             // 账户余额
-            double oldUserMoney = baseMapper.getonlineMoney(order.getUserId());
+            double oldUserMoney = baseMapper.getUserMoney(order.getUserId());
             double userMoney = MathUtil.add(oldUserMoney, amount).doubleValue();
             // 可用余额
             Double oldAvailableMoney = baseMapper.getAbleUserMoney(order.getUserId());
             double availableMoney = MathUtil.add(oldAvailableMoney, amount).doubleValue();
-            //充值线上余额
-            payOrderMapper.updateOnlineMoneyByUserId(userMoney, availableMoney, order.getUserId());
+            payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
             log.info("【支付异步回调】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
             //保存余额到余额收支记录
             BalanceRecordPo balanceRecord = new BalanceRecordPo();
             balanceRecord.setUserId(order.getUserId());
             balanceRecord.setType(1);
             if (rechargeFlag == 1) {
-                balanceRecord.setBalanceType(16);
+                balanceRecord.setBalanceType(6);
             } else {
-                balanceRecord.setBalanceType(17);
+                balanceRecord.setBalanceType(7);
             }
             balanceRecord.setAddDate(new Date());
             balanceRecord.setAmount(amount);
@@ -431,17 +430,17 @@ public class HeliPayServiceImpl implements HeliPayService {
             log.info("【支付异步回调】>>>>>更新用户采美豆(update[user(userBeans:" + userBeans + ")])，userId:" + beansHistory.getUserId());
         }
         // 已支付短信推送 不是本地或者测试
-        boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
-        String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
-        if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
-            String shortLink = remoteCallService.getShortLink(8, 6, "https://www.caimei365.com/user/order/detail.html?orderId=" + orderId);
-            String content = "您已成功支付订单（订单编号：" + order.getOrderNo() + "）全部款项，支付总金额￥" + order.getPayTotalFee() + "，采美平台将立即安排发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
-                    "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
-            boolean sendSms = remoteCallService.getSendSms(6, bindMobile, content);
-            if (!sendSms) {
-                log.info("取消订单推送失败，orderId>>>>" + orderId);
-            }
-        }
+//        boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
+//        String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
+//        if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
+//            String shortLink = remoteCallService.getShortLink(8, 6, "https://www.caimei365.com/user/order/detail.html?orderId=" + orderId);
+//            String content = "您已成功支付订单（订单编号：" + order.getOrderNo() + "）全部款项，支付总金额￥" + order.getPayTotalFee() + "，采美平台将立即安排发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
+//                    "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
+//            boolean sendSms = remoteCallService.getSendSms(6, bindMobile, content);
+//            if (!sendSms) {
+//                log.info("取消订单推送失败，orderId>>>>" + orderId);
+//            }
+//        }
         return "SUCCESS";
     }
 
@@ -1022,23 +1021,22 @@ public class HeliPayServiceImpl implements HeliPayService {
             }
         }
         if (rechargeFlag > 0) {
-            // 账户线上余额
-            double oldUserMoney = baseMapper.getonlineMoney(order.getUserId());
+            // 账户余额
+            double oldUserMoney = baseMapper.getUserMoney(order.getUserId());
             double userMoney = MathUtil.add(oldUserMoney, amount).doubleValue();
             // 可用余额
             Double oldAvailableMoney = baseMapper.getAbleUserMoney(order.getUserId());
             double availableMoney = MathUtil.add(oldAvailableMoney, amount).doubleValue();
-            // 充值线上
-            payOrderMapper.updateOnlineMoneyByUserId(userMoney, availableMoney, order.getUserId());
+            payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
             log.info("【支付异步回调】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
             //保存余额到余额收支记录
             BalanceRecordPo balanceRecord = new BalanceRecordPo();
             balanceRecord.setUserId(order.getUserId());
             balanceRecord.setType(1);
             if (rechargeFlag == 1) {
-                balanceRecord.setBalanceType(16);
+                balanceRecord.setBalanceType(6);
             } else {
-                balanceRecord.setBalanceType(17);
+                balanceRecord.setBalanceType(7);
             }
             balanceRecord.setAddDate(new Date());
             balanceRecord.setAmount(amount);
@@ -1049,7 +1047,6 @@ public class HeliPayServiceImpl implements HeliPayService {
             baseMapper.insertBalanceRecord(balanceRecord);
             log.info("【支付异步回调】>>>>>>>>>>>>>>>>>>>>>>>>>>订单商品充值余额(insert[cm_user_balance_record])orderId：" + orderId);
         }
-
         // 线上支付与自主下单送豆（已全部收款），最后一笔线上支付成功后，赠送200采美豆
         if (3 == order.getReceiptStatus() && 0 == order.getSecondHandOrderFlag()) {
             UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();