添加 支付成功接口

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/SyncOrderParam.java

@@ -7,26 +7,28 @@ import java.math.BigDecimal;
 
 @Data
 public class SyncOrderParam implements Cloneable {
-    @ApiModelProperty(value = "orderId")
+    @ApiModelProperty(value = "不用管")
     private String orderId;
-    @ApiModelProperty(value = "status")
+    @ApiModelProperty(value = "支付状态[1-成功|0-失败]")
     private Integer status;
-    @ApiModelProperty(value = "type")
-    private String type;
-    @ApiModelProperty(value = "code")
+    @ApiModelProperty(value = "[写死]HUIFU_PAY_CODE")
     private String code;
-    @ApiModelProperty(value = "paymentId")
+    @ApiModelProperty(value = "汇付相关id")
     private String paymentId;
-    @ApiModelProperty(value = "orderCode")
+    @ApiModelProperty(value = "[写死]huifu")
+    private String paymentType;
+    @ApiModelProperty(value = "支付时间")
+    private String paymentAt;
+    @ApiModelProperty(value = "masterOrderCode")
     private String orderCode;
-    @ApiModelProperty(value = "orderCodeId")
+
+    @ApiModelProperty(value = "不用管")
+    private String type;
+    @ApiModelProperty(value = "不用管")
     private String orderCodeId;
-    @ApiModelProperty(value = "price")
+    @ApiModelProperty(value = "不用管")
     private BigDecimal price;
-    @ApiModelProperty(value = "paymentType")
-    private String paymentType;
-    @ApiModelProperty(value = "paymentAt")
-    private String paymentAt;
+
 
     private static final SyncOrderParam obj = new SyncOrderParam();
     public static SyncOrderParam getNew() {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinStoreZhengzaiController.java

@@ -3,13 +3,11 @@ package com.liquidnet.service.goblin.controller;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
 import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
 import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -64,11 +62,18 @@ public class GoblinStoreZhengzaiController {
     }
 
     @PostMapping("details")
-    @ApiOperation("详情")
+    @ApiOperation("订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
     })
     public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
         return goblinOrderAppService.orderDetails(orderId, null);
     }
+
+    @PostMapping("paySuccess")
+    @ApiOperation("支付成功")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
+        return goblinOrderService.syncOrder(syncOrderParam);
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -585,7 +585,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 storeOrder.setPaymentType(syncOrderParam.getPaymentType());
                 storeOrder.setPaymentId(syncOrderParam.getPaymentId());
                 storeOrder.setPayCode(syncOrderParam.getCode());
-                storeOrder.setPayTime(now);
+                LocalDateTime payTime = LocalDateTime.parse(syncOrderParam.getPaymentAt(),DTF_YMD_HMS);
+                storeOrder.setPayTime(payTime);
                 if (orderVo.getWriteOffCode().equals("EMPTY")) {
                     storeOrder.setWriteOffCode(IDGenerator.getWriteOffCode());
                 } else {
@@ -638,7 +639,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 }
                 //redis
                 orderVo.setPayCode(storeOrder.getPayCode());
-                orderVo.setPayTime(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(storeOrder.getPayTime()));
+                orderVo.setPayTime(syncOrderParam.getPaymentAt());
                 orderVo.setWriteOffCode(storeOrder.getWriteOffCode());
                 orderVo.setStatus(storeOrder.getStatus());
                 orderVo.setPaymentId(syncOrderParam.getPaymentId());