商城订单下单

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -3,12 +3,9 @@ package cn.freemud.adapter;
 import cn.freemud.entities.dto.OrderExtInfoDto;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.enums.DeliveryChannelEnum;
-import cn.freemud.utils.KeyGeneratorUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
-import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -75,12 +72,6 @@ public class DeliveryAdapter {
         });
         deliveryOrderRequestDto.setProductInfos(productInfos);
 
-        // mock
-//        deliveryOrderRequestDto.setOrderId(String.valueOf(KeyGeneratorUtil.transCodeToId(String.valueOf(orderBean.getOid()))));
-//        deliveryOrderRequestDto.setWxAppId("wx17747e8875943c8a");
-//        deliveryOrderRequestDto.setOpenId("oqlGZ5a3uQD95fdjtT8kwDg5mygo");
-//        deliveryOrderRequestDto.setAccessToken("28_1lUbMZJxQawogg-xb3CjlvOGMSx3cmjIgPC-YcNRMxi3SVaPznm7SOelmCj5u0KXafOv3cTLdwLr00yNjwt6RArcwI8PFuf8d1vKfsMiI4dP4a6WWxJ_AYK45v8VBgse5693XkgmH5zsl2wxLHWbAFAUQF");
-
         return deliveryOrderRequestDto;
     }
 }

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -617,7 +617,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             // 获取门店信息
             StoreResponse storeResponse = checkOrder.getStoreInfo(orderBean.getCompanyId(), orderBean.getShopId(), trackingNo);
             if (storeResponse == null || storeResponse.getBizVO() == null) {
-                LogUtil.error("createDelivery getStoreInfo fail", orderBean.getShopId(), gson.toJson(storeResponse));
+                LogUtil.info(trackingNo, "createDelivery getStoreInfo fail", orderBean.getShopId(), gson.toJson(storeResponse));
                 return false;
             }
             OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
@@ -627,7 +627,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             getAuthorizerRequestDto.setAuthorizerAppid(orderExtInfoDto.getAppid());
             GetTokenResponseDto getTokenResponseDto = wechatApplicationServiceClient.getToken(getAuthorizerRequestDto);
             if(getTokenResponseDto == null || getTokenResponseDto.getData() == null) {
-                LogUtil.error("createDelivery getToken fail", gson.toJson(getAuthorizerRequestDto), gson.toJson(getTokenResponseDto));
+                LogUtil.info(trackingNo, "createDelivery getToken fail", gson.toJson(getAuthorizerRequestDto), gson.toJson(getTokenResponseDto));
                 return false;
             }
             String accessToken = getTokenResponseDto.getData().getAccessToken();
@@ -637,7 +637,7 @@ public class MallOrderServiceImpl implements MallOrderService {
              * 创建配送单失败
              */
             if (createDeliveryOrderResponseDto == null || ResponseCodeConstant.RESPONSE_SUCCESS != createDeliveryOrderResponseDto.getCode() || createDeliveryOrderResponseDto.getData() == null) {
-                LogUtil.error("createDelivery deliveryOrderAdd fail", gson.toJson(createDeliveryOrderRequestDto), gson.toJson(createDeliveryOrderResponseDto));
+                LogUtil.info(trackingNo, "createDelivery deliveryOrderAdd fail", gson.toJson(createDeliveryOrderRequestDto), gson.toJson(createDeliveryOrderResponseDto));
                 return false;
             }
             String deliveryId = createDeliveryOrderResponseDto.getData().getDeliveryId();
@@ -646,7 +646,7 @@ public class MallOrderServiceImpl implements MallOrderService {
              * 运单查询失败
              */
             if (dtoDeliveryResponse == null || ResponseCodeConstant.RESPONSE_SUCCESS != dtoDeliveryResponse.getCode() || dtoDeliveryResponse.getData() == null) {
-                LogUtil.error("createDelivery deliveryOrderOne fail", deliveryId, gson.toJson(dtoDeliveryResponse));
+                LogUtil.info(trackingNo, "createDelivery deliveryOrderOne fail", deliveryId, gson.toJson(dtoDeliveryResponse));
                 return false;
             }
             DeliveryInfoDto deliveryInfoDto = dtoDeliveryResponse.getData();
@@ -672,7 +672,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtil.error("createDelivery exception", gson.toJson(orderBean), Throwables.getStackTraceAsString(e));
+            LogUtil.info(trackingNo, "createDelivery exception", gson.toJson(orderBean), Throwables.getStackTraceAsString(e));
             return false;
         }
     }

order-application-service/src/main/java/cn/freemud/service/thirdparty/WechatApplicationServiceClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface WechatApplicationServiceClient {
 
-    @PostMapping(value = "/token/application/delivery/getToken")
+    @PostMapping(value = "/token/application/delivery/getTokenForDelivery")
     GetTokenResponseDto getToken(@RequestBody GetAuthorizerRequestDto request);
 }
 

order-application-service/src/main/java/cn/freemud/utils/KeyGeneratorUtil.java

-
-package cn.freemud.utils;
-import org.apache.commons.lang.StringUtils;
-
-/**
- * key生成器
- *
- */
-public class KeyGeneratorUtil {
-
-    public static final int RESERVE_LENGTH = 3;
-    public static final String RESERVE_STR = "000";
-
-    public static final int USER_ID_LENGTH = 2;
-    public static final String PAD_STR = "0";
-
-    /**
-     * 取模
-     */
-    public static final int mode = 6;
-
-    /**
-     * code转换成id
-     *
-     * @param code
-     * @return
-     */
-    public static Long transCodeToId(String code) {
-        if (StringUtils.isEmpty(code)) {
-            return null;
-        }
-        int end = StringUtils.length(code) - RESERVE_LENGTH - USER_ID_LENGTH;
-        return Long.valueOf(StringUtils.substring(code, 0, end));
-    }
-}