1

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

 package com.liquidnet.service.goblin.controller;
 
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.dto.manage.vo.SyncOrderParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
 import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
 import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Slf4j
@@ -36,4 +40,18 @@ public class GoblinAppOrderController {
     public ResponseDto<GoblinPayInnerResultVo> getZhengzaiMarketList(@RequestBody GoblinOrderParam param) {
         return goblinAppOrderService.checkOrder(param);
     }
+
+    @PostMapping("syncOrder")
+    @ApiOperation("支付回调")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
+        return null;
+    }
+
+//    @PostMapping("payAgain")
+//    @ApiOperation("再次支付")
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    public ResponseDto<GoblinPayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
+//        return null;
+//    }
 }

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

 package com.liquidnet.service.goblin.util;
 
-import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtThumbVo;
@@ -28,7 +27,6 @@ public class ObjectUtil {
     private static final ArrayList<GoblinStorePurchaseSkuVo> goblinStorePurchaseSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfZhengzaiSkuVo> goblinSelfZhengzaiSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinShowStoreInfoVo> goblinShowStoreInfoVoArrayList = new ArrayList<>();
-    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
 
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
@@ -37,10 +35,6 @@ public class ObjectUtil {
         return goblinStoreMgtGoodsVoPagedResult.clone();
     }
 
-    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
-        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
-    }
-
     public static ArrayList<GoblinShowStoreInfoVo> getGoblinShowStoreInfoVoArrayList() {
         return (ArrayList<GoblinShowStoreInfoVo>) goblinShowStoreInfoVoArrayList.clone();
     }