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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

@@ -39,4 +39,6 @@ public class BgOrderListVo {
 	private Integer detailId;
 	//车辆编号
 	private Integer vehicleCode;
+
+	private Integer userId;
 }

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

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
@@ -35,9 +34,10 @@ public class OrderPageVO extends BaseOrder {
     private String startCompanyName;
 
     private String endCompanyName;
-
+    //用户手机号
     private String telephone;
-
+    // "用户职位名称"
+    private  String positionName;
     //订单违约金
     private String dedDetailDTO;
     /**

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

@@ -230,7 +230,12 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
 
-
+    /**
+     * 后台获取订单详情
+     * @param no
+     * @param userDTO
+     * @return
+     */
 	public ObjectRestResponse<OrderPageVO> orderDetail(String no, UserDTO userDTO) {
 		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
 		if (orderPageVo == null) {
@@ -240,6 +245,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		if(appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
+            orderPageVo.setPositionName(appUserVo.getPositionName());
 		}
 		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
 		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
@@ -442,8 +448,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
 
-
-
+    /**
+     * 初始化违约金实体
+     * @param dedDetailDTO
+     * @param type
+     * @param cost
+     * @param stringBuilder
+     */
     public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
         String detailName = null;
         if (type == OrderViolateEnum.BEFORE.getCode()) {
@@ -527,6 +538,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
     }
 
+    /**
+     * 修改订单还车公司
+     * @param orderRentVehicleDetail
+     * @return
+     */
     public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
         if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
             return ObjectRestResponse.paramIsEmpty();

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

@@ -430,10 +430,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             //设置违约金
                 //设置原来算出的违约金及描述
             csv.setViolateAmount(inProgressVO.getViolateAmount());
-            csv.setViolateDesc(inProgressVO.getViolateDesc());
+            csv.setViolateDesc("");
                 //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
+            if(StrUtil.isBlank(csv.getViolateDesc())) {
+                csv.setViolateDesc(inProgressVO.getViolateDesc());
+            }
+
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
                     //crosstown.getRestDeposit().subtract(illegalReserve);
@@ -634,10 +638,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //还车扣除款 剩余的 钱，再减去违章预备金
             refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
-            refundDesc += refundAmont.toString();
+            refundDesc += StrUtil.format("(扣除{}: {})", DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT.getDesc(), orderViolation.getPrice().toString());
         }else {
             refundAmont = orvd.getReturnPayResidue();
-            refundDesc += refundAmont.toString();
         }
         oad.setOriginDepositAmount(orvd.getReturnPayResidue());
         oad.setDepositAmount(refundAmont);

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

@@ -76,6 +76,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         depositRefundRecord.setIscomplete(complete);
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUND.getCode());
         insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setIscomplete(false);
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());

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

@@ -354,7 +354,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
             if (dto.getEndTime() == null) {
                 dto.setEndTime(dto.getStartTime());
             }
-
         }
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getTourList(query.getSuper()));

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -248,6 +248,7 @@
         v1.code AS vehicleCode,
         a1. NAME AS username,
         a2.username AS telephone,
+        a2.id As userId,
         b1.id AS orderId,
         b1.`no` AS orderNo,
         b1.`status` as status,

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -603,7 +603,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         try {
             log.info("支付宝退款中：outTradeNo = {}， tradNo = {}, refundAmount = {}, refundReason = {}", outTradeNo, tradNo, refundAmount, refundReason);
             AlipayTradeRefundResponse response = alipayClient.execute(request);
-            log.info("APP支付退款response: {}" + response.getBody());
             if (response.isSuccess()) {
                 return true;
             } else {
@@ -641,6 +640,31 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         return ObjectRestResponse.succ(response.getBody());
     }
 
+    /**
+     * 预授权转支付退款
+     * @param tradNo 预授权转支付商户订单号
+     * @param refundAmount 退款金额
+     * @param refundReason 退款原因
+     * @param outRequestNo 退款标志号
+     */
+    public void testTradeRefund(String tradNo, Integer refundAmount,  String refundReason, String outRequestNo) {
+        AlipayClient alipayClient = getAlipayClient();
+        AlipayTradeRefundModel model = new AlipayTradeRefundModel();
+        BigDecimal realAmount = new BigDecimal(refundAmount.toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
+        model.setOutTradeNo(tradNo); //与预授权转支付商户订单号相同，代表对该笔交易退款
+        model.setRefundAmount(realAmount.toString());
+        model.setRefundReason(refundReason);
+        model.setOutRequestNo(outRequestNo);//标识一次退款请求，同一笔交易多次退款需要保证唯一，如部分退款则此参数必传。
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        request.setBizModel(model);
+        AlipayTradeRefundResponse response = null;
+        try {
+            response = alipayClient.execute(request);
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        log.info("response: {}"+response.getBody());
+    }
     public static void main(String[] args) throws AlipayApiException {
         OrderPayBiz orderPayBiz = new OrderPayBiz();
         OrderPayVo orderPayVo = new OrderPayVo();
@@ -650,9 +674,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         orderPayVo.setAmount(3);
         orderPayVo.setBody("扣除租车订单费用");
         orderPayVo.setSubject("租车订单交易费用");
-        //orderPayBiz.fundAuthOrderUnFreeze("201911150924550001122", "2019111510002001530506470085", 1, "退还违约金");
+        orderPayBiz.testTradeRefund("216584713656209408", 105000, "退还违约金1050元", "2165847136562094081050");
+        //orderPayBiz.fundAuthOrderUnFreeze(orderPayVo, "");
         //orderPayBiz.alipayOrderRefund("20191024153859000003","2019102422001421530513773694", 2, "xxxx", "");
-        //orderPayBiz.tradePay("20191108195202000020", "2019110810002001710518149012", 120000,"退还押金", "退还押金");
+        //orderPayBiz.tradePay(orderPayVo, "");
         //orderPayBiz.fundAuthCancel(orderPayVo, "");
         //orderPayBiz.tradePay("20191114182254000019", "2019111410002001530505959461", 1,"扣除违约金", "扣除违约金");
         orderPayBiz.fundAuthQuery("20191115092455000004");