Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -5,6 +5,7 @@ import cn.freemud.amqp.MQAction;
 import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.base.util.JsonUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -70,6 +71,8 @@ import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
 import com.google.gson.Gson;
+import com.mysql.jdbc.log.LogUtils;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -86,6 +89,7 @@ import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.R
 
 @Import(ManagerOrderBeanConfig.class)
 @Service
+@Log4j
 public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
     @Autowired
@@ -242,6 +246,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
             if (couponLockRequest != null) {
                 BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
+                log.info(JsonUtil.toJSONString("券码锁定返回=="+couponLockResponseBaseResponse));
                 if (!ObjectUtils.equals(RESPONSE_SUCCESS, couponLockResponseBaseResponse.getStatusCode())) {
                     CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
                     orderCancel(cancelOrderRequest);