1

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -559,7 +559,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             HashMap<String, Object> m1 = new HashMap<>();
 //          根据油号  店铺id  用户id  锁定唯一囤油卡
             m1.put("mt_user_id",ljUserVo.getId());
-            m1.put("store_id",ljUserVo.getStoreId());
+            m1.put("store_id",fuelDiesel.getStoreId());
             m1.put("oil_name",fuelDiesel.getOilNumberId());
             List<MtUserFuel>  userFuels = mtUserFuelMapper.selectByMap(m1);
 //          没有油卡则新建  有则追加囤油升数

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java

@@ -568,11 +568,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
             map.putAll(getMerchantConfig(allOrder));
 
             Map<String, String> refund = fyPayService.refund(map);
-        } else {
-            throw new RuntimeException("其它类型支付正在维护中！");
         }
 
-
         allOrder.setRefMoney(allOrder.getGoodsMoney());
         allOrder.setRefBy(String.valueOf(now.getId()));
         allOrder.setStatus("refund");
@@ -583,10 +580,29 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
         cashierOrderService.updateById(cashierOrder);
 
 //      2.根据 用户优惠券id 把优惠券还原状态
+        String cardCouponUserId = map.get("cardCouponUserId");
+        if (ObjectUtil.isNotEmpty(cardCouponUserId)) {
+            CardCouponUser cardCouponUser = cardCouponUserMapper.selectById(cardCouponUserId);
+            cardCouponUser.setStatus("0");
+            cardCouponUserMapper.updateById(cardCouponUser);
+        }
 
+//      4.如果是 囤油卡 车队卡 储值卡  则按照  减少记录  还原
+        if (orderNo.equals("fule_card")) {
 
-//      4.如果是 囤油卡 车队卡 储值卡  则进行另外处理
+        }
+        if (orderNo.equals("car_card_value")) {
 
+        }
+        if (orderNo.equals("card_value")) {
+
+        }
+
+//      5.如果是 小程序码付款   则按照 油品表的  囤油卡金额  和  储值卡金额 还原
+        if (orderNo.equals("APPLET_CODE")) {
+
+        }
+//      6. 如果是现金无需任何特殊操作
 
         return 1;
     }

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -442,7 +442,7 @@
       <div v-if="isPay"
            v-loading="loading"
       >
-        <div v-if="payType != 'fule_card'">
+        <div v-if="payForm.paymentType != 'fule_card'">
           <div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
           <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
             ￥{{ payForm.realyPayBills }}
@@ -1056,6 +1056,7 @@ export default {
       }
     },
     async collection1() {
+      console.log(this.flag)
       // 这里是收银台结算 下面是会员充值
       if (this.flag == 3) {
         this.collection()
@@ -1145,6 +1146,7 @@ export default {
     // 确认充值
     async rechargeConfirm() {
       let selectCard = this.$refs.rechargeRef.selectCard
+      console.log("子弹窗表单属性", selectCard)
       if (!selectCard.paymentType) {
         this.$message.error('请选择支付方式')
         return
@@ -1508,7 +1510,7 @@ export default {
         }
       })
       this.loading = true
-      console.log(1480, isPaySuccess)
+
       if (!isPaySuccess) {
         await _this.queryPayStatus()
         _this.resetting1()
@@ -1517,7 +1519,6 @@ export default {
     // 立即结算
     async settlement() {
 
-
       this.cardBalance=0
       // 囤油   这时候卡余额是 升
       if (this.payType == 'fule_card') {