验劵准备和验劵接口增加记录

share-system/src/main/java/share/system/service/impl/QPServiceImpl.java

@@ -19,6 +19,8 @@ import com.dianping.openapi.sdk.api.tuangou.entity.*;
 import com.dianping.openapi.sdk.httpclient.DefaultOpenAPIClient;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -49,7 +51,7 @@ public class QPServiceImpl implements QPService {
     private String APP_KEY;
     @Value("${dianping.appSecret}")
     private String APP_SECRET;
-
+    private static final Logger logger = LoggerFactory.getLogger(QPServiceImpl.class);
 
     @Autowired
     private ISCouponService isCouponService;
@@ -208,6 +210,8 @@ public class QPServiceImpl implements QPService {
         if (Boolean.FALSE.equals(b)) {
             throw new RuntimeException("请联系管理员");
         }
+        logger.info("code:{}", code);
+        logger.info("验卷准备开始");
         String o = redisUtil.get(ReceiptRdeisEnum.MT_SESSION_KEY.getValue());
         JSONObject sessionKey = new JSONObject(o);
         String session = (String) sessionKey.get("access_token");
@@ -216,8 +220,10 @@ public class QPServiceImpl implements QPService {
         DefaultOpenAPIClient client = new DefaultOpenAPIClient();
         TuangouReceiptPrepareResponse invoke = client.invoke(tuangouReceiptPrepare);
         if (invoke.getCode() != 200) {
+            logger.error("验卷准备失败:{}", invoke.getMsg());
             throw new RuntimeException(invoke.getMsg());
         }
+        logger.info("验卷准备结束:{}", invoke.getData());
         return invoke.getData();
     }
 
@@ -228,6 +234,8 @@ public class QPServiceImpl implements QPService {
     @Override
     public List<TuangouReceiptConsumeResponseEntity> consume(String code, int count, String openShopUuid) {
         String o = redisUtil.get(ReceiptRdeisEnum.MT_SESSION_KEY.getValue());
+        logger.info("code:{}", code);
+        logger.info("验卷开始");
         JSONObject sessionKey = new JSONObject(o);
         String session = (String) sessionKey.get("access_token");
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
@@ -238,9 +246,11 @@ public class QPServiceImpl implements QPService {
         TuangouReceiptConsume tuangouReceiptConsume = new TuangouReceiptConsume(request);
         TuangouReceiptConsumeResponse invoke = openAPIClient.invoke(tuangouReceiptConsume);
         if (invoke.getCode() != 200) {
+            logger.error("验卷失败:{}", invoke.getMsg());
             throw new RuntimeException(invoke.getMsg());
         }
         redisUtil.delete(ReceiptRdeisEnum.PREPARE.getValue() + code);
+        logger.info("验卷结束:{}", invoke.getData());
         return invoke.getData();
     }
 

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -722,13 +722,14 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         SStore sStore = storeService.getById(sOrder.getStoreId());
         if (couponId != null && couponId > 0) {
             SConsumerCoupon consumerCoupon = consumerCouponService.getById(couponId);
-            if (consumerCoupon != null) {
-
+            if (ObjectUtil.isNotEmpty(consumerCoupon)) {
+                if (consumerCoupon.getUseStatus().equals(UserStatusEnum.UNUSED.getCode())) {
                     qpService.consume(consumerCoupon.getCouponCode(), 1, sStore.getOpenShopUuid());
                     consumerCoupon.setUseStatus(UserStatusEnum.USED.getCode());
                     consumerCouponService.updateById(consumerCoupon);
                 }
             }
+        }
         //续费成功语音播报
         if (sOrder.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
             deviceOpService.actionExecute(sOrder.getRoomId(), sOrder.getConsumerPhone(), VoiceEnum.RENEWAL_SUCCESS.getCode(),