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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -257,7 +257,7 @@ public class AppPermissionService {
         if (StringUtils.isBlank(mobilecodeRedis)) {
             return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
         }
-        if(StringUtils.isNotBlank(code)||appUserDetailBiz.getUserByCode(code)==0){
+        if(StringUtils.isNotBlank(code)&&appUserDetailBiz.getUserByCode(code)==0){
             return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
         }
         // 是否已存在
@@ -593,7 +593,10 @@ public class AppPermissionService {
                         if (register.getInteger("status") == ResultCode.EXIST_CODE) {
                             return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
                         }
-                        return JsonResultUtil.createFailedResult(register.getInteger("code"), "操作失败");
+                        if (register.getInteger("status") == ResultCode.NOTEXIST_CODE) {
+                            return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, register.getString("message"));
+                        }
+                        return JsonResultUtil.createFailedResult(register.getInteger("status"), "操作失败");
                     }
                     return register;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/calculate/InProgressVO.java

@@ -60,6 +60,16 @@ public class InProgressVO {
      */
     List<String> backCoupons = Lists.newArrayList();
 
+    /**
+     * 优惠金额
+     */
+    private BigDecimal couponAmount = BigDecimal.ZERO;
+
+    /**
+     * 优惠描述
+     */
+    private String couponDesc = "";
+
     /**
      * 返还的免费天数
      */

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

@@ -483,6 +483,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //生成额外的费用明细
             csv.setConsumeAmount(inProgressVO.getConsumeAmount());
+            csv.setCouponAmount(inProgressVO.getCouponAmount());
+            csv.setCouponDesc(inProgressVO.getCouponDesc());
             csv.setModelAmount(vehicleItemDTO.getUnitPrice());
             csv.setUsedAmount(inProgressVO.getUsedAmount());
             csv.setUsedDayNum(inProgressVO.getUsedDays());

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

@@ -149,6 +149,15 @@ public class OrderCalculateBiz {
                     if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
                         //能够使用优惠券，则不返还
                         couponAmounts.add(couponAmount);
+
+                        //叠加优惠券金额
+                        inProgressVO.setCouponAmount(inProgressVO.getCouponAmount().add(couponAmount));
+
+                        //叠加优惠券描述
+                        List<Coupon> ableUsedCoupons = activityFeign.couponsByTickerNoList(CollUtil.newArrayList(tickerNo));
+                        if(null != ableUsedCoupons && ableUsedCoupons.size() > 0) {
+                            inProgressVO.setCouponDesc(inProgressVO.getCouponDesc()+ ableUsedCoupons.get(0).getTitle());
+                        }
                     } else {
                         backCouponNos.add(tickerNo);
                     }

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

@@ -167,6 +167,8 @@ public class OrderCancelBiz {
                         CancelStartedVO csv = new CancelStartedVO();
                         csv.setType(CostDetailExtend.CANCEL_STARTED);
                         csv.setConsumeAmount(inProgressVO.getConsumeAmount());
+                        csv.setCouponAmount(inProgressVO.getCouponAmount());
+                        csv.setCouponDesc(inProgressVO.getCouponDesc());
                         csv.setModelAmount(vehicleItemDTO.getUnitPrice());
                         csv.setUsedAmount(inProgressVO.getUsedAmount());
                         csv.setUsedDayNum(inProgressVO.getUsedDays());