update

src/main/java/com/gogirl/application/order/member/impl/ChargeOrderServiceImpl.java

@@ -268,6 +268,8 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
                 .build();
         customerBalanceRecordMapper.insert(customerBalanceRecord);
 
+        if (discountConfig.getCouponId() != null && discountConfig.getCouponId() != 0) {
             couponService.sendCoupon(discountConfig.getCouponId(), customer.getId());
         }
+    }
 }

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -61,7 +61,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 @Slf4j
 public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, OrderManage> implements OrderManageService {
 
@@ -859,15 +859,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
 
         log.info("扣除余额");
-        CustomerBalance customerBalance = customerBalanceMapper.selectOne(new LambdaQueryWrapper<CustomerBalance>().eq(CustomerBalance::getCustomerId, orderManage.getOrderUser()));
-        ConsumerCommand consumerCmd = ConsumerCommand.builder()
-                .amount(customerBalance.getBalance())
-                .customerId(orderManage.getOrderUser())
-                .departmentId(orderManage.getDepartmentId())
-                .orderId(orderManage.getId())
-                .orderStatus(orderManage.getStatus())
-                .build();
-        customerBalanceService.consumer(consumerCmd);
+        CustomerBalance customerBalance = customerBalanceMapper.selectOne(new LambdaQueryWrapper<CustomerBalance>()
+                .eq(CustomerBalance::getCustomerId, orderManage.getOrderUser()));
 
         BigDecimal balanceAmount = new BigDecimal(customerBalance.getBalance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
         BigDecimal wxAmount = orderManage.getTotalPaymentAmount().subtract(balanceAmount);
@@ -880,6 +873,16 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 .type(2).build();
         orderManage.setMultiplePaymentType(JsonUtilByFsJson.beanToJson(Lists.newArrayList(wxMultiPaymentType, balanceMultiPaymentType)));
 
+
+        ConsumerCommand consumerCmd = ConsumerCommand.builder()
+                .amount(customerBalance.getBalance())
+                .customerId(orderManage.getOrderUser())
+                .departmentId(orderManage.getDepartmentId())
+                .orderId(orderManage.getId())
+                .orderStatus(orderManage.getStatus())
+                .build();
+        customerBalanceService.consumer(consumerCmd);
+
         marketService.setterOrder(orderManage.getId());
         orderManageMapper.updateById(orderManage);
     }