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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -426,28 +426,28 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
         List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
         if (entitiesListTemp.size() > 0) {
-            double priceActual = kylinOrderTickets.getPriceActual().doubleValue();
-            double priceExpress = kylinOrderTickets.getPriceExpress().doubleValue();
+            BigDecimal priceActual = kylinOrderTickets.getPriceActual();
+            BigDecimal priceExpress = kylinOrderTickets.getPriceExpress();
             int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
                     new QueryWrapper<KylinOrderTicketEntities>()
                             .eq("order_id", kylinOrderTickets.getOrderTicketsId())
                             .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
-            double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
+            BigDecimal onePrice = (priceActual.subtract(priceExpress)).divide(BigDecimal.valueOf(allEntitiesCount));//单价
             for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
                 Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         kylinOrderTickets.getOrderTicketsId(),
                         KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL,
                         entities.getOrderTicketEntitiesId()
                 );
-                double canRefundedPrice;
+                BigDecimal canRefundedPrice;
                 if (null != refundedPrice) {
-                    canRefundedPrice = onePrice - refundedPrice;
+                    canRefundedPrice = onePrice.subtract(BigDecimal.valueOf(refundedPrice));
                 } else {
                     canRefundedPrice = onePrice;
                 }
-                entities.setCanRefundedPrice(BigDecimal.valueOf(canRefundedPrice));
-                if (canRefundedPrice > 0) { // 退款中但是可退款金额为0不展示
+                entities.setCanRefundedPrice(canRefundedPrice);
+                if (canRefundedPrice.compareTo(BigDecimal.ZERO) > 0) { // 退款中但是可退款金额为0不展示
                     entitiesList.add(entities);
                 }
             }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -180,10 +180,20 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
 
             // 生成签名并请求
             String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/placeOrder");
-            HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
             System.out.println(result);
-            if (hashMap.get("succ").equals("fail")) {
-                String msg = (String) hashMap.get("msg");
+            HashMap hashMap = new HashMap();
+            try {
+                hashMap = JsonUtils.fromJson(result, HashMap.class);
+            } catch (Exception e) {
+                return ResponseDto.failure(result);
+            }
+            if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
+                String msg = "";
+                if (null == hashMap.get("succ")) {
+                    msg = result;
+                } else {
+                    msg = (String) hashMap.get("msg");
+                }
                 return ResponseDto.failure(msg);
             } else {
                 HashMap hashMapResult = (HashMap) hashMap.get("result");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/ShunfengSignUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.UserPathDto;
+import com.liquidnet.service.kylin.entity.KylinOrderExpress;
+import com.liquidnet.service.kylin.mapper.KylinOrderExpressMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -13,6 +16,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -51,6 +55,9 @@ public class ShunfengSignUtils {
      */
     private final static Long CHECK_TIME = 600000L;
 
+    @Autowired
+    private KylinOrderExpressMapper kylinOrderExpressMapper;
+
     /**
      * 生成签名并请求
      * @param hbody 请求body
@@ -92,6 +99,7 @@ public class ShunfengSignUtils {
         } catch (Exception e) {
             System.out.println("发送请求失败");
             e.printStackTrace();
+            return e.getMessage();
         } finally {
             if (client != null) {
                 try {