Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/DateController.java

@@ -24,6 +24,7 @@ public class DateController {
         @Autowired
         private ActivityPopularizeUserBiz activityPopularizeUserBiz;
 
+        @Autowired
         private UserCouponBiz  userCouponBiz;
 
 

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/WithDrawRuleVo.java

@@ -36,7 +36,7 @@ public class WithDrawRuleVo {
     /**
      * 最多提现次数（月）
      */
-    private Integer  maxNumberOfWithdraw;
+    private Integer  maxNumberOfMonth;
 
     /**
      * 最多提现次数（日）

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -118,8 +118,16 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
                 return v;
             }).collect(Collectors.toList()));
         }
-    }
 
+        //判断是否价格为0
+//        BigDecimal realAmount = detail.getOrder().getRealAmount();
+//        if(BigDecimal.ZERO.compareTo(realAmount) > 0) {
+//            throw new BaseException(ResultCode.FAILED_CODE);
+//        }else if(BigDecimal.ZERO.compareTo(realAmount) = 0) {
+//            //直接支付
+//            baseOrderBiz.payNotifyHandle();
+//        }
+    }
     /**
      * 计算价格
      * @param detail