Merge branch 'holiday-price' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -151,7 +151,7 @@ public class AppUserController extends CommonBaseController{
         Integer id= userVo.getId();
         Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
-        if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
+        if(userVo.getIsMember()!=null && userVo.getIsMember()>0){
             //获取用户会员信息
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -175,8 +175,10 @@ public class OrderCancelBiz {
                         csv.setUsedfreeDayNum(inProgressVO.getUsedfreeDays());
                         csv.setUsedFreeAmount(inProgressVO.getUsedFreeDaysAmount());
                         csv.setHadConpon((StrUtil.isNotBlank(baseOrder.getCouponTickerNos())? Boolean.TRUE: Boolean.FALSE));
-                        csv.setViolateAmount(BigDecimal.ZERO);
-                        csv.setViolateDesc("");
+
+                        csv.setViolateAmount(inProgressVO.getViolateAmount());
+                        csv.setViolateDesc(inProgressVO.getViolateDesc());
+                        csv.setViolateAmountList(inProgressVO.getViolateAmountList());
 
                         csv.setAbleUsedDayNum(inProgressVO.getUseAmountList().size());
                         csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
@@ -185,14 +187,15 @@ public class OrderCancelBiz {
                         csv.setOverAmountList(inProgressVO.getOverAmountList());
 
                         //如果有扣款项，则生成额外的费用明细
-                        if(oad.getDeductions().size() > 0) {
-                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
-                                if(DeductionTypeEnum.VIOLATE_ADVANCE.getCode().equals(deduction.getType())) {
-                                    csv.setViolateAmount(deduction.getAmount());
-                                    csv.setViolateDesc(deduction.getName());
-                                }
-                            }
-                        }
+                        // inProgressVO已经包含 ViolateAmount ViolateDesc
+//                        if(oad.getDeductions().size() > 0) {
+//                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
+//                                if(DeductionTypeEnum.VIOLATE_ADVANCE.getCode().equals(deduction.getType())) {
+//                                    csv.setViolateAmount(deduction.getAmount());
+//                                    csv.setViolateDesc(deduction.getName());
+//                                }
+//                            }
+//                        }
 
                         //设置订单数据
                         baseOrder.setViolateAmount(csv.getViolateAmount());