Merge branch 'holiday-price' 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----次数不能为空----");