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

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

@@ -96,8 +96,8 @@ FROM
         SELECT
         ausw.*,
         aul.username AS `phone`,
-        IFNULL(aud.realname,aud.nickname) AS  `sourceName`,
-        IFNULL(audd.realname,audd.nickname) AS `userName`
+        IFNULL(aud.realname,aull.username) AS  `sourceName`,
+        IFNULL(audd.realname,aul.username) AS `userName`
         FROM
         ( SELECT * FROM `app_user_selling_water` WHERE 1 = 1
         <if test="status !=null">
@@ -124,10 +124,12 @@ FROM
             WHERE `username` = #{phone}
         </if>
         ) AS aul ON aul.id = ausw.user_id
+        INNER JOIN `app_user_login` AS `aull` ON aull.id=ausw.source_id
         INNER JOIN `app_user_detail` AS aud ON aud.userid = ausw.source_id
         INNER JOIN ( SELECT * FROM `app_user_detail`
         <if test="userName!=null and userName!=' '">
             WHERE `realname` LIKE CONCAT('%',#{userName},'%') OR `nickname` LIKE CONCAT('%',#{userName},'%')
         </if>) AS audd ON audd.userid = ausw.user_id
+      ORDER BY ausw.crt_time DESC
     </select>
 </mapper>
\ No newline at end of file

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

@@ -236,7 +236,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }
 
             orv.setFreeze2PayAmount(freeze2PayAmount);
-            orv.setFreeze2PayDesc("");
+            orv.setFreeze2PayDesc("冻结转支付订单号: "+ baseOrder.getNo());
 
             ObjectRestResponse<String> result = thirdFeign.refund(orv);
             refundTradeNo = result.getData();

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

@@ -356,7 +356,7 @@ public class OrderCalculateBiz {
                 if(timeLag < 0 ) {
                     Integer useDays = getIncludeDays(orderPageVO.getOrderRentVehicleDetail().getStartTime(), DateTime.now().getMillis());
                     OrderAccountDetail oad = new OrderAccountDetail();
-                    inProgressVO = inProgressCalculate(orderPageVO, vehicleItemDTO, useDays, new OrderAccountDetail(), Boolean.FALSE);
+                    inProgressVO = inProgressCalculate(orderPageVO, vehicleItemDTO, useDays, oad, Boolean.FALSE);
 
                     topAmount = vehicleItemDTO.getTopAmount(useDays);
                     totalDeductAmount = oad.realTotalDeduct();

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

@@ -160,7 +160,7 @@ public class OrderCancelBiz {
 
                         //结合
                         //退款子流程: 订单基础，退款描述，退款金额
-                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
+                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount(), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
 
                         //生成额外的费用明细

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -401,7 +401,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }});
         orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
         orv.setOrderNo(baseOrder.getNo());
-        orv.setRefundDesc("退款");
+        orv.setRefundDesc("退款订单号："+ no);
         orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
         ObjectRestResponse<String> result = thirdFeign.refund(orv);
         return ObjectRestResponse.succ(result);