Merge branch 'feature/20201123-svc卡券核销fix-lcf' into develop

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

@@ -465,16 +465,7 @@ public class OrderServiceImpl implements Orderservice {
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }
-        /*
-        ShoppingCartGoodsDto.SendPoint value = (ShoppingCartGoodsDto.SendPoint)redisCache.getValue(RedisKeyConstant.KGD_SENDPOINT_ORDERID + var1.getOrderId());
-        if (value != null){
-            var1.setSendPointActivityCode(value.getActivityCode());
-            var1.setSendPointEndTime(value.getEndTime());
-            var1.setSendPointMaxNum(value.getMaxNum());
-            var1.setSendPointSendPoint(value.getSendPoint());
-            var1.setSendPointValidityDateDays(value.getValidityDateDays());
-        }
-         */
+
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);
@@ -545,6 +536,9 @@ public class OrderServiceImpl implements Orderservice {
         }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
+        log.info("调用券码核销==" + message.getTrans_id());
+        verificationCoupon(message.getTrans_id());
+        log.info("调用券码结束=="+ message.getTrans_id());
         return sendPaySuccessNoticeMessage();
     }
 
@@ -621,9 +615,6 @@ public class OrderServiceImpl implements Orderservice {
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
-                log.info("调用券码核销=="+newMessage.getTransId());
-                verificationCoupon(newMessage.getTransId());
-                log.info("调用券码结束=="+newMessage.getTransId());
                 return newSendPaySuccessNoticeMessage();
             } else {
                 return newSendPayFaileMessage();