Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

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

@@ -148,7 +148,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
             walletpg.setWithdrawaling(withDrawaling);
             walletpg.setWithdrawals(walletpg.getWithdrawals() == null ? new BigDecimal(0) : walletpg.getWithdrawals());
             walletpg.setUnbooked(walletpg.getUnbooked() == null ? new BigDecimal(0) : walletpg.getUnbooked());
-            walletpg.setTotalAmount(walletpg.getTodayAmount() == null ? new BigDecimal(0) : walletpg.getTotalAmount());
+            walletpg.setTotalAmount(walletpg.getTotalAmount() == null ? new BigDecimal(0) : walletpg.getTotalAmount());
             walletpg.setTotalConsumption(totalConsumpution);
             AppUserDetail appUserDetail = userdetailMap.get(wallet.getUserId());
             if (Objects.nonNull(appUserDetail)){

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){

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -96,8 +96,26 @@ FROM
         SELECT
         ausw.*,
         aul.username AS `phone`,
-        IFNULL(aud.realname,aull.username) AS  `sourceName`,
-        IFNULL(audd.realname,aul.username) AS `userName`
+        (
+        CASE
+        WHEN aud.realname = "" THEN
+        aull.username
+        WHEN aud.realname IS NULL THEN
+        aull.username
+        ELSE
+        aud.realname
+        END
+        )AS  `sourceName`,
+        (
+        CASE
+        WHEN audd.realname = "" THEN
+        aul.username
+        WHEN audd.realname IS NULL THEN
+        aul.username
+        ELSE
+        audd.realname
+        END
+        )  AS `userName`
         FROM
         ( SELECT * FROM `app_user_selling_water` WHERE 1 = 1
         <if test="status !=null">

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,14 +167,18 @@ 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());
                         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());
@@ -183,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());