订单提交

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderAttrVo.java

@@ -2,6 +2,8 @@ package com.liquidnet.service.goblin.dto.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +39,7 @@ public class GoblinOrderAttrVo implements Serializable,Cloneable {
     @ApiModelProperty(value = " 订单的赠品信息格式为JSON")
     private String giftInfos;
     @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
     private static final GoblinOrderAttrVo obj = new GoblinOrderAttrVo();

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

@@ -40,7 +40,7 @@ public class GoblinOrderController {
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
-        return null;
+        return goblinAppOrderService.syncOrder(syncOrderParam);
     }
 
     @PostMapping("payAgain")

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

@@ -133,9 +133,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 //下单
                 GoblinOrderPreParam pre = order(param, storeParam, uid, isMember, addressesVo, orderMasterCode, orderId, orderCode);
                 preParam.setPriceActual(preParam.getPriceActual().add(pre.getPriceActual()));
-                preParam.setStoreName(pre.getStoreName() + "," + pre.getStoreName());
-                preParam.setSkuName(pre.getSkuName() + "," + pre.getSkuName());
-                preParam.setOrderIdList(pre.getOrderIdList() + "," + pre.getOrderIdList());
+                preParam.setStoreName(preParam.getStoreName() + "," + pre.getStoreName());
+                preParam.setSkuName(preParam.getSkuName() + "," + pre.getSkuName());
+                preParam.setOrderIdList(preParam.getOrderIdList() + "," + pre.getOrderIdList());
 
                 GoblinOrderSqlParam sqlParam = GoblinOrderSqlParam.getNew();
                 sqlParam.setStoreOrder(pre.getStoreOrder());
@@ -311,7 +311,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             httpData.add("name", preParam.getStoreName());
             httpData.add("detail", preParam.getSkuName());
             httpData.add("orderCode", preParam.getOrderMasterCode());
-            httpData.add("orderId", preParam.getOrderIdList());
+            httpData.add("orderId", preParam.getOrderIdList().substring(1));
             httpData.add("clientIp", CurrentUtil.getCliIpAddr());
             httpData.add("notifyUrl", synUrl);
             httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -529,10 +529,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     return "fail";//重复支付
                 }
             }
-            if (orderVo.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
-                log.error("订单号：" + syncOrderParam.getOrderCode() + " 价格不符");
-                return "fail";//价格不符
-            }
+//            if (orderVo.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
+//                log.error("订单号：" + syncOrderParam.getOrderCode() + " 价格不符");
+//                return "fail";//价格不符
+//            }
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
             LinkedList<Object[]> sqlDataSku = CollectionUtil.linkedListObjectArr();