Merge branch 'dev' into test

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

@@ -249,7 +249,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 break;
             case "reject":
-                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 break;
             case "unfilled":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};

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

@@ -417,7 +417,7 @@ public class KylinRefundsStatusServiceImpl {
             params.add("paymentId", oderInfo.getPaymentId());
             params.add("paymentType", oderInfo.getPaymentType());
             params.add("price", String.valueOf(refundPrice));
-            params.add("priceTotal", String.valueOf(refundPrice));
+            params.add("priceTotal", String.valueOf(oderInfo.getPriceTotal()));
             params.add("reason", refund.getReason());
 
             /*String sign = StringUtils.Ksort(params);

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dragon.yml

@@ -69,7 +69,7 @@ spring:
       simple:
         acknowledge-mode: manual
   redis:
-    database: 15
+    database: 0
     port: ${liquidnet.redis.dragon.port}
     host: ${liquidnet.redis.dragon.host}
     password: ${liquidnet.redis.dragon.password}

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml

@@ -79,7 +79,7 @@ spring:
     virtual-host: ${liquidnet.rabbitmq.virtual-host}
     connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
-    database: 15
+    database: 0
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketEntitiesMapper.xml

@@ -33,6 +33,7 @@
         <where>
             AND a.order_tickets_id = #{orderTicketsId}
             AND a.status != ${orderRefundStatusCancel}
+            AND a.status != 5
             AND b.order_ticket_entities_id = #{orderTicketEntitiesId}
         </where>
     </select>

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/resp/WePayRefundReturnDto.java

@@ -43,4 +43,8 @@ public class WePayRefundReturnDto {
     private String couponRefundCount;
     @XStreamAlias("cash_refund_fee")
     private String cashRefundFee;
+    @XStreamAlias("err_code")
+    private String errCode;
+    @XStreamAlias("err_code_des")
+    private String errCodeDes;
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -104,11 +104,10 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 } else if (dto.getResult().equalsIgnoreCase("error")) {
                     //调用回调
                     log.error("");
+                    return ResponseDto.failure("退款失败:" + dto.getMessage());
                 } else if (dto.getResult().equalsIgnoreCase("exception")) {
                     log.error("");
                 }
-
-
                 DragonRefundAppDto refundAppDto = new DragonRefundAppDto();
                 refundAppDto.setOrderCode(orderCode);
                 refundAppDto.setCode(code);
@@ -167,6 +166,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     String jsonStr = EntityUtils.toString(entity, "UTF-8");
                     log.debug("JSONSTR = " + jsonStr);
                     WePayRefundReturnDto wePayRefundReturnDto = XmlUtil.toBean(jsonStr, WePayRefundReturnDto.class);
+                    if (wePayRefundReturnDto.getErrCodeDes() != null) {
+                        channelDto.setResult("error");
+                        channelDto.setMessage(paymentType + " refund error: " + wePayRefundReturnDto.getErrCodeDes());
+                        contentDto.setRequest(data);
+                        contentDto.setResponse(jsonStr);
+                        channelDto.setContent(contentDto);
+                        return channelDto;
+                    }
                     log.debug("BEAN  = " + wePayRefundReturnDto);
                     if (!wePayRefundReturnDto.getReturnCode().equalsIgnoreCase("SUCCESS") || wePayRefundReturnDto.getReturnCode() == null) {
                         try {
@@ -376,7 +383,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setRefundPrice(info.getRefundFee());
                     dto.setRefundAt(refundAt);
                     dto.setRefundError(callBackDto.getReturnMsg());
-                    log.debug("SEND WEPAY NOTIFTURL = "+ JSON.toJSONString(dto));
+                    log.debug("SEND WEPAY NOTIFTURL = " + JSON.toJSONString(dto));
                     sendNotifyUrl(dto);
 
                     mqHandleUtil.sendMySqlRedis(
@@ -432,7 +439,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setRefundAt(callBackDto.getGmtRefund());
                     dto.setRefundPrice(response.getRefundAmount());
                     dto.setRefundError("");
-                    log.debug("SEND ALIPAY NOTIFTURL = "+ JSON.toJSONString(dto));
+                    log.debug("SEND ALIPAY NOTIFTURL = " + JSON.toJSONString(dto));
                     sendNotifyUrl(dto);
 
                     mqHandleUtil.sendMySqlRedis(
@@ -473,7 +480,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         params.add("refundError", notifyUrlDto.getRefundError());
         params.add("refundPrice", notifyUrlDto.getRefundPrice());
         params.add("status", notifyUrlDto.getStatus().toString());
-        String response = HttpUtil.post( dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()), params);
+        String response = HttpUtil.post(dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()), params);
         log.debug("RETURN RESPONSE=" + response);
         if (response.equals("success")) {
             mqHandleUtil.sendMySqlRedis(