bugfix

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -167,4 +167,7 @@ public interface OrderCommonMapper {
     List<OrderProductVo> getOrderProductByShopOrderId(Integer shopOrderId);
 
     Double findShopFee(Integer shopOrderId);
+
+    Double findEachDiscount(Integer shopOrderId);
 }
+

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

@@ -197,6 +197,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             Date date = new Date();
             String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
             order.setUpdateDate(curDateStr);
+            order.setOnlinePayFlag(1);
             // 更新订单支付状态
             payOrderMapper.updateOrderStatus(order);
             // 剩余待付金额
@@ -209,6 +210,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             }
             //可用=可用-本次抵扣
             availableMoney = MathUtil.sub(availableMoney, balancePayFee).doubleValue();
+            userMoney = MathUtil.sub(userMoney,balancePayFee).doubleValue();
             payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
             log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
             //保存余额到余额收支记录
@@ -250,8 +252,6 @@ public class PayOrderServiceImpl implements PayOrderService {
             }
             log.info("支付成功" + order.getUserId());
         }
-        order.setOnlinePayFlag(1);
-        baseMapper.updateOrderOnlineFlag(order.getOrderId());
         Map<String, Object> map = new HashMap<>(2);
         map.put("order", order);
         map.put("balancePayFee", balancePayFee);
@@ -298,7 +298,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 }
             });
             if (offlineFlag.get()) {
-                return ResponseJson.error("已经线下支付过，只能线下支付！", null);
+                order.setOnlinePayFlag(1);
             }
             order.setReceiptAmount(receiptAmount.get());
         }
@@ -686,6 +686,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()){
             shop.setObligation(orderCommonMapper.findShopFee(shopOrderId));

src/main/resources/mapper/OrderCommonMapper.xml

@@ -140,7 +140,6 @@
           AND cdr.delFlag = '0'
           AND cdr.receiptStatus = '3'
           AND cdr.payType != '16'
-          AND cdr.receiptStatus IN (2, 3)
         ORDER BY cdr.receiptDate DESC
     </select>
     <select id="getVipDiscernReceipt" resultType="com.caimei365.order.model.vo.DiscernReceiptVo">
@@ -612,7 +611,6 @@
           AND cdr.delFlag = '0'
           AND cdr.receiptStatus = '3'
           AND cdr.payType != '16'
-          AND cdr.receiptStatus IN (2, 3)
         ORDER BY cdr.receiptDate DESC
     </select>
     <select id="getShopOrderByOrderId" resultType="com.caimei365.order.model.vo.ShopOrderVo">
@@ -711,4 +709,7 @@
         from cm_shop_order
         where shopOrderID = #{shopOrderId}
     </select>
+    <select id="findEachDiscount" resultType="java.lang.Double">
+        select eachDiscount from cm_shop_order where shopOrderID = #{shopOrderId}
+    </select>
 </mapper>

src/main/resources/mapper/PayOrderMapper.xml

@@ -22,9 +22,6 @@
         <if test="paySuccessCounter != null and paySuccessCounter != ''">
             ,paySuccessCounter = #{paySuccessCounter}
         </if>
-        <if test="onlinePayFlag != null">
-            ,onlinePayFlag = #{onlinePayFlag}
-        </if>
         ,updateDate = #{updateDate}
         WHERE orderID = #{orderId}
     </update>