修改出货接口 和 汇付支付回调（回调成功直接出货）

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

@@ -37,10 +37,10 @@ public interface IGoblinAppZhengzaiService {
 
     /**
      * 正在下单出货
-     * @param masterCode
+     * @param offCode 出货码
      * @return
      */
-    ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(String masterCode);
+    ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(String offCode);
 
     /**
      * 订单绑定

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

@@ -96,10 +96,10 @@ public class GoblinAppZhengzaiController {
     @ApiOperation("正在下单-出货")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "offCode", value = "取货码", example = "1"),
     })
-    public ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(@RequestParam("masterCode") @Valid String masterCode) {
-        return goblinAppZhengzaiService.orderPush(masterCode);
+    public ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(@RequestParam("offCode") @Valid String offCode) {
+        return goblinAppZhengzaiService.orderPush(offCode);
     }
 
     @PostMapping("checkPayment_dup2")

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

@@ -82,8 +82,8 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
     }
 
     @Override
-    public ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(String masterCode) {
-        String[] orderIds = redisUtils.getOffCode(masterCode);
+    public ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(String offCode) {
+        String[] orderIds = redisUtils.getOffCode(offCode);
         List<GoblinZhengzaiPushVo> listVo = ObjectUtil.getGoblinZhengzaiPushVoArrayList();
         LocalDateTime now = LocalDateTime.now();
         LinkedList<String> sqls = CollectionUtil.linkedListString();

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

@@ -323,7 +323,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     } else {
                         storeOrder.setWriteOffCode("");
                     }
-                    storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
+                    storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     storeOrder.setUpdatedAt(now);
                     sqls.add(SqlMapping.get("goblin_order.pay.order"));
                     sqlDataOrder.add(new Object[]{
@@ -336,7 +336,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                         GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuVoIds);
                         //增加销量
                         redisUtils.incrSkuSaleCount(orderSkuVo.getSpuId(), orderSkuVo.getSkuId(), orderSkuVo.getNum());
-                        orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
+                        orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                         //redis
                         redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo);
                         //mongo
@@ -364,7 +364,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                         mongoUtils.insertGoblinOrderLogVo(logVo);
                         //mysql
                         sqlDataSku.add(new Object[]{
-                                GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now,
+                                orderSkuVo.getStatus(), now,
                                 orderSkuVo.getOrderSkuId(), now, now
                         });
                     }