Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import java.math.BigDecimal;
 import java.util.*;
@@ -59,7 +61,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
 
 
     //计算用户拥金
-
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void orderWater(OrderWaterDTO orderWaterDTO) {
         if (orderWaterDTO == null) {
             log.info("计算用户拥金----orderWater----次数不能为空----");
@@ -226,6 +228,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                         sellingWater.setWaiting(1);
                         sellingWater.setStatus(1);
                         sellingWater.setCommission(commission);
+                        sellingWater.setId(null);
                         insertSelective(sellingWater);
                         log.info("租车订单完成计算用户拥成功----payOrderWater--------userId===" + userId);
                         amount = amount.subtract(commission);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -76,7 +76,8 @@ public class WaterMQHandler {
                         case RENT_VEHICLE:
                             //租车订单finlish不处理，退还第一部分押金后再处理
                             if(orderMQDTO.getSign().equals(ORDER_FINISH)) {
-                                break;
+                                //直接结束
+                                return;
                             }
                             orderMQDTO.getItemByTypeEnum(ItemTypeEnum.VEHICLE_MODEL);
                             orderWaterDTO.setGoodsDTOList(