修改汇付回调

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

@@ -557,7 +557,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                         logVo.setOrderCode(orderVo.getOrderCode());
                         logVo.setPayCode(orderVo.getPayCode());
                         logVo.setStoreId(orderVo.getStoreId());
-                        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
+                        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()) > 0) {
                             logVo.setOrderType("zhengzai");
                         } else {
                             logVo.setOrderType("order");
@@ -627,7 +627,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         logVo.setOrderId(orderVo.getOrderId());
         logVo.setOrderCode(orderVo.getOrderCode());
         logVo.setPayCode(orderVo.getPayCode());
-        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
+        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()) > 0) {
             logVo.setOrderType("zhengzai");
         } else {
             logVo.setOrderType("order");

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

@@ -581,6 +581,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 
         log.info(UserPathDto.setData("下单(唤起支付)", preParam, payInnerResultVo));
         if (isFree && preParam.getPayType().equals("huifu")) {
+            SyncOrderParam syncOrderParam = SyncOrderParam.getNew();
+            syncOrderParam.setOrderCode(preParam.getOrderMasterCode());
+            syncOrderParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
+            syncOrderParam.setCode(payCode);
+            syncOrderParam.setPrice(preParam.getPriceActual());
+            syncOrderParam.setPaymentId("FREE_PAYMENT_ID");
+            syncOrderParam.setPaymentType(null);
+            syncOrderParam.setStatus(1);
+            syncOrder(syncOrderParam);
             return ResponseDto.success(payInnerResultVo);
         } else if (isFree) {
             SyncOrderParam syncOrderParam = SyncOrderParam.getNew();