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

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonPayOrderQueryRespDto.java

+package com.liquidnet.service.dragon.dto;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonPayOrderQueryRespDto
+ * @Package com.liquidnet.service.dragon.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/13 15:39
+ */
+@Data
+public class DragonPayOrderQueryRespDto {
+    private String code;
+
+    private String orderCode;
+
+    private String status;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/PayDataVo.java

@@ -10,31 +10,17 @@ import java.io.Serializable;
 public class PayDataVo implements Serializable {
 
     private static final long serialVersionUID = -5841205289132250565L;
-    @JsonProperty("appId")
-    private String appid;
-    @JsonProperty("appid")
     private String appId;
-    @JsonProperty("nonceStr")
-    private String noncestr;
-    @JsonProperty("noncestr")
     private String nonceStr;
-    @JsonProperty("timeStamp")
-    private String timestamp;
-    @JsonProperty("timestamp")
     private String timeStamp;
-
-
     @JsonProperty("package")
-    private String packageOther;
     private String packages;
-
-    private String partnerid;
-    private String prepayid;
+    private String partnerId;
+    private String prepayId;
     private String sign;
-    private String mweb_url;
+    private String mwebUrl;
     private String paySign;
     private String signType;
-
-    private String redirect_url;
-    private String order_str;
+    private String redirectUrl;
+    private String orderStr;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayInnerResultVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.liquidnet.service.kylin.dto.vo.middle.PayDataVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class PayInnerResultVo implements Serializable {
+
+    private String code;
+    private String orderCode;
+    private Integer status;
+    private String orderId;
+    private String showUrl;
+    private String returnUrl;
+    private BigDecimal price;
+    private PayDataVo payData;
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayResultVo.java

@@ -12,19 +12,6 @@ public class PayResultVo implements Serializable {
     private static final long serialVersionUID = 1541552316829686035L;
 
     private String code;
-
-    private String order_code;
-
-    private Integer status;
-
-    private String order_id;
-
-    private String showUrl;
-
-    private String returnUrl;
-
-    private BigDecimal price;
-
-    private PayDataVo pay_data;
-
+    private String message;
+    private PayInnerResultVo data;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsOrderService.java

@@ -20,10 +20,10 @@ import java.util.List;
 public interface IKylinOrderTicketsOrderService {
 
     // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
+    ResponseDto<PayInnerResultVo> checkCanOrder(PayOrderParam payOrderParam);
 
     // 再次支付(待支付->可支付->倒计时结束释放库存)
-    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
+    ResponseDto<PayInnerResultVo> payAgain(PayAgainParam payAgainParam);
 
     // 支付回调(待支付->已支付->中断倒计时)
     String syncOrder(SyncOrderParam syncOrderParam);

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -54,8 +54,8 @@ liquidnet:
         url: http://devservice.zhengzai.tv/
     order:
       url-pay:
-        pay: http://devpay.zhengzai.tv/
-        check: http://devpay.zhengzai.tv/order/verify
+        pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://devorder.zhengzai.tv/order/order/syncOrder
       url-service:
         url: http://devservice.zhengzai.tv/

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -138,6 +138,11 @@ public class KylinOrderTickets implements Serializable {
      */
     private String paymentType;
 
+    /**
+     * 支付的订单号
+     */
+    private String paymentId;
+
     /**
      * 支付时间
      */
@@ -240,7 +245,7 @@ public class KylinOrderTickets implements Serializable {
      */
     public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
+                paymentId,paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/impl/AbstractAlipayStrategy.java

 package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.channel.alipay.biz.AlipayBiz;
 import com.liquidnet.service.dragon.channel.alipay.req.AlipayTradePayReq;
@@ -40,7 +41,9 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         alipayTradePayReq.setBody(dragonPayBaseReqDto.getDetail());
         //dragon中支付编号
         alipayTradePayReq.setOutTradeNo(dragonPayBaseReqDto.getCode());
-        alipayTradePayReq.setTimeExpire(dragonPayBaseReqDto.getExpireTime());
+        //设置订单过期时间
+        String timeExpire = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(dragonPayBaseReqDto.getCreateDate()).plusMinutes(Long.parseLong(dragonPayBaseReqDto.getExpireTime())),DateUtil.Formatter.yyyyMMddHHmmss);
+        alipayTradePayReq.setTimeExpire(timeExpire);
         alipayTradePayReq.setNotifyUrl(this.getNotifyUrl());
         alipayTradePayReq.setTimestamp(dragonPayBaseReqDto.getCreateDate());
         //调用支付

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

@@ -4,7 +4,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 
 @Data
-@XStreamAlias("xml")
+@XStreamAlias("root")
 public class WePayRefundReturnCallBackInfoDto {
     @XStreamAlias("out_refund_no")
     private String outRefundNo;

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -106,7 +106,8 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         parameters.put("body", dragonPayBaseReqDto.getName());
         parameters.put("detail", dragonPayBaseReqDto.getDetail());
         parameters.put("out_trade_no", dragonPayBaseReqDto.getCode());
-        parameters.put("time_expire", "203110908103456");
+        String timeExpire = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(dragonPayBaseReqDto.getCreateDate()).plusMinutes(Long.parseLong(dragonPayBaseReqDto.getExpireTime())),DateUtil.Formatter.yyyyMMddHHmmssTrim);
+        parameters.put("time_expire", timeExpire);
         parameters.put("notify_url", this.getNotifyUrl());
         return parameters;
     };

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import com.liquidnet.service.dragon.service.IDragonOrdersService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -47,7 +48,9 @@ public class PayController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "detail", value = "订单描述", example = "测试订单001"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderCode", value = "订单编号", example = "ORDER0001"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "clientIp", value = "客户端ip", example = "127.0.0.1"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "notifyUrl", value = "通知url", example = "testdragon.zhengzai.tv"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "notifyUrl", value = "通知url", example = "devdragon.zhengzai.tv"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "createDate", value = "订单创建时间", example = "2021-07-13 13:00:00"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "expireTime", value = "订单过期时间", example = "5"),
     })
     @ResponseBody
     public ResponseDto<DragonPayBaseRespDto> dragonPay(
@@ -65,8 +68,8 @@ public class PayController {
 //               @RequestParam(value = "quitUrl",required = false)  String quitUrl,
 //               @RequestParam(value = "showUrl",required = false)  String showUrl,
 //               @RequestParam(value = "code",required = false)  String code,
-               @RequestParam(value = "createDate",required = false)  String createDate,
-               @RequestParam(value = "expireTime",required = false)  String expireTime){
+               @RequestParam(value = "createDate",required = true)  String createDate,
+               @RequestParam(value = "expireTime",required = true)  String expireTime){
         //为什么在js和applet中才需要判断open_id?
         if(payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())){
             if(StringUtil.isEmpty(openId)){
@@ -92,4 +95,18 @@ public class PayController {
         dragonPayBaseReqDto.setExpireTime(expireTime);
         return dragonOrdersService.dragonPay(dragonPayBaseReqDto);
     }
+    @PostMapping("/checkOrder")
+    @ApiOperation("订单查询")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "", example = "PAY202107131522368438531155")
+    })
+    @ResponseBody
+    public ResponseDto<DragonPayOrderQueryRespDto> checkOrder(@RequestParam(value = "code") @NotNull(message = "支付编号不能为空！") String code){
+        DragonPayOrderQueryRespDto respDto = new DragonPayOrderQueryRespDto();
+        respDto.setCode(code);
+        respDto.setOrderCode("");
+        respDto.setStatus(DragonConstant.PayStatusEnum.STATUS_PAID.getCode());
+        return ResponseDto.success(respDto);
+    }
 }

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

@@ -394,6 +394,80 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
+    public String aliPayRefundCallBack(HttpServletRequest request, HttpServletResponse response) {
+        InputStream inStream;
+        ByteArrayOutputStream outSteam;
+        LocalDateTime nowTime = LocalDateTime.now();
+        try {
+            inStream = request.getInputStream();
+            outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+            // 获取微信调用我们notify_url的返回信息
+            String jsonStr = new String(outSteam.toByteArray(), "utf-8");
+            outSteam.close();
+            inStream.close();
+            log.debug("JSON = " + jsonStr);
+            WePayRefundReturnCallBackDto callBackDto = XmlUtil.toBean(jsonStr, WePayRefundReturnCallBackDto.class);
+            log.debug("DATA = " + callBackDto);
+            if (callBackDto.getReturnCode().equalsIgnoreCase("SUCCESS")) {
+                String reqInfo = PayWepayUtils.getInstance().unCodeReqInfo(callBackDto.getReqInfo());
+                log.debug("REQINFO = " + reqInfo);
+                WePayRefundReturnCallBackInfoDto info = XmlUtil.toBean(reqInfo, WePayRefundReturnCallBackInfoDto.class);
+                String outRefundNo = info.getOutRefundNo();
+                String refundAt = info.getSuccessTime();
+                try {
+                    sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_log.insert"),
+                            new Object[]{outRefundNo, info.getRefundRequestSource(), JSON.toJSONString(info), nowTime, nowTime}
+                    );
+                    sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_success.update"),
+                            new Object[]{nowTime, refundAt, DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), outRefundNo}
+                    );
+
+                    NotifyUrlDto dto = new NotifyUrlDto();
+                    if (info.getRefundStatus().equalsIgnoreCase("SUCCESS")) {
+                        dto.setStatus(1);
+                    } else {
+                        dto.setStatus(0);
+                    }
+//                    dto.setOrderCode();
+//                    dto.setCode();
+//                    dto.setType();
+//                    dto.setPrice();
+//                    dto.setPaymentType();
+//                    dto.setPaymentId();
+//                    dto.setPaymentAt();
+
+                    dto.setOrderRefundCode(info.getOutRefundNo());
+                    dto.setRefundCode(info.getOutTradeNo());
+                    dto.setRefundPrice(info.getRefundFee());
+//                    dto.setRefundReason();
+                    dto.setRefundId(info.getRefundId());
+//                    dto.setRefundType(info.getrefund);
+                    dto.setRefundAt(refundAt);
+                    dto.setRefundError(callBackDto.getReturnMsg());
+                    sendNotifyUrl(dto);
+                    return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("");
+                    return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+                }
+            } else {
+                return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("");
+            return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+        }
+    }
+
     /**
      * 给 REDIS 队列发送消息 数据库相关
      *
@@ -432,6 +506,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         params.add("refundPrice", notifyUrlDto.getRefundPrice());
         params.add("status", notifyUrlDto.getStatus().toString());
         String response = HttpUtil.post((String) redisUtil.get(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()), params);
+        log.debug("RETURN RESPONSE="+response);
         if (response.equals("success")) {
             sendMySqlRedis(
                     SqlMapping.get("dragon_order_refund_call_back.update"),

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -494,6 +494,7 @@ CREATE TABLE `kylin_order_tickets`
     `refund_number`        int(32)          NOT NULL DEFAULT 0 COMMENT '退款张数',
     `pay_type`             varchar(255)     NOT NULL DEFAULT '' COMMENT '选择支付方式',
     `payment_type`         varchar(255)     NULL     DEFAULT '' COMMENT '实际支付方式',
+    `payment_id`           varchar(255)     NULL     DEFAULT '' COMMENT '支付的订单号',
     `time_pay`             varchar(255)     NULL     DEFAULT '' COMMENT '支付时间',
     `express_contacts`     varchar(255)     NOT NULL DEFAULT '' COMMENT '收货人',
     `express_address`      varchar(255)     NOT NULL DEFAULT '' COMMENT '收货地址',

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java

@@ -41,7 +41,7 @@ public class KylinOrderTicketsController {
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
+    public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
         return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
 
@@ -49,7 +49,7 @@ public class KylinOrderTicketsController {
     @PostMapping("pre2")
     @ApiOperation("下单2")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
+    public ResponseDto<PayInnerResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
         PayOrderParam payOrderParam = encryptedReq.getData();
         return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
@@ -57,8 +57,8 @@ public class KylinOrderTicketsController {
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-        PayResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
+    public ResponseDto<PayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
+        PayInnerResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -18,7 +18,7 @@ kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET upda
 
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_id =? ,payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)