Browse Source

线上支付微信开户标记

zhijiezhao 3 năm trước cách đây
mục cha
commit
522f8571e6

+ 2 - 0
src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -169,5 +169,7 @@ public interface OrderCommonMapper {
     Double findShopFee(Integer shopOrderId);
 
     Double findEachDiscount(Integer shopOrderId);
+
+    String findWeChatFlag(String splitCode,Integer shopId);
 }
 

+ 4 - 0
src/main/java/com/caimei365/order/model/vo/ShopOrderVo.java

@@ -215,4 +215,8 @@ public class ShopOrderVo implements Serializable {
      * 返佣订单关联页面展示用
      */
     private OrderVo mainOrder;
+    /**
+     * 子订单分帐号
+     */
+    private String splitCode;
 }

+ 9 - 2
src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -210,7 +210,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             }
             //可用=可用-本次抵扣
             availableMoney = MathUtil.sub(availableMoney, balancePayFee).doubleValue();
-            userMoney = MathUtil.sub(userMoney,balancePayFee).doubleValue();
+            userMoney = MathUtil.sub(userMoney, balancePayFee).doubleValue();
             payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
             log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId:" + order.getUserId() + ",orderId:" + orderId);
             //保存余额到余额收支记录
@@ -659,6 +659,12 @@ public class PayOrderServiceImpl implements PayOrderService {
     public ResponseJson<Map<String, Object>> getCheckoutShopOrders(Integer shopOrderId) {
         // 订单信息
         ShopOrderVo shop = orderCommonMapper.getShopOrderByOrderId(shopOrderId);
+        String weChatFlag = "0";
+        if(StringUtils.isNotBlank(shop.getSplitCode())){
+            weChatFlag = orderCommonMapper.findWeChatFlag(shop.getSplitCode(),shop.getShopId());
+        }else{
+            weChatFlag = "2";
+        }
         OrderVo order = orderCommonMapper.getOrderByOrderId(shop.getOrderId());
         Integer onlinePay = order.getOnlinePayFlag();
         if (null == shop || null == order) {
@@ -689,7 +695,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         shop.setReceiptAmount(receiptAmount.get());
         shop.setEachDiscount(orderCommonMapper.findEachDiscount(shopOrderId));
         shop.setObligation(MathUtil.sub(shop.getRealPay(), receiptAmount.get()).doubleValue());
-        if(998==shop.getShopId()){
+        if (998 == shop.getShopId()) {
             shop.setObligation(orderCommonMapper.findShopFee(shopOrderId));
         }
         // 总成本
@@ -740,6 +746,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         map.put("discernReceipt", discernReceiptList);
         map.put("orderProductList", orderProductByShopOrderId);
         map.put("onlinePay", onlinePay);
+        map.put("weChatFlag", weChatFlag);
         return ResponseJson.success(map);
     }
 

+ 6 - 0
src/main/resources/mapper/OrderCommonMapper.xml

@@ -645,6 +645,7 @@
                cop.realPay,
                cop.receiptAmount,
                cop.receiptStatus,
+               cop.splitCode,
                ifnull(cop.paySuccessCounter,0) as paySuccessCounter,
                p.name          as shopName
         FROM cm_shop_order cop
@@ -714,4 +715,9 @@
     <select id="findEachDiscount" resultType="java.lang.Double">
         select eachDiscount from cm_shop_order where shopOrderID = #{shopOrderId}
     </select>
+    <select id="findWeChatFlag" resultType="java.lang.String">
+        SELECT ifnull(weChatFlag,0) FROM cm_shop_splitcode
+        WHERE commercialCode = #{splitCode}
+        and shopId = #{shopId}
+    </select>
 </mapper>