新增应用;优惠券支持锁券

src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java

@@ -464,6 +464,17 @@ public class Open2DuibaController {
 
             Result<Boolean> sendCouponResult = jdApiUtil.pushCoupon(appEnum, accessToken.getAccessToken(), couponId, pin, uuid);
             LOGGER.info("发放优惠券,sendCouponResult={},uid={},pin={},uuid={}", JSON.toJSONString(sendCouponResult), uid, pin, uuid);
+            if (!sendCouponResult.getSuccess()) {
+                // 如果失败是因为未锁券
+                if (Objects.equals("67", sendCouponResult.getCode())) {
+                    // 锁券
+                    sendCouponResult = jdApiUtil.lockCoupon(appEnum, accessToken.getAccessToken(), couponId);
+                    if (sendCouponResult.getSuccess()) {
+                        // 再发券
+                        sendCouponResult = jdApiUtil.pushCoupon(appEnum, accessToken.getAccessToken(), couponId, pin, uuid);
+                    }
+                }
+            }
             return sendCouponResult;
         } catch (BizException e) {
             return ResultBuilder.fail(e.getMessage());
@@ -511,10 +522,10 @@ public class Open2DuibaController {
             JdAppEnum appEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey());
             String pin = convert2Pin(appEnum, accessToken.getAccessToken(), uid);
 
-            Result<Boolean> sendCouponResult = jdApiUtil.sendPoints(
+            Result<Boolean> result = jdApiUtil.sendPoints(
                     appEnum, pin, param.getBusinessId(), param.getPoints(), param.getDesc(), accessToken.getAccessToken());
-            LOGGER.info("互动积分发放积分,sendCouponResult={},uid={},pin={}", JSON.toJSONString(sendCouponResult), uid, pin);
-            return sendCouponResult;
+            LOGGER.info("互动积分发放积分,result={},uid={},pin={}", JSON.toJSONString(result), uid, pin);
+            return result;
         } catch (BizException e) {
             return ResultBuilder.fail(e.getMessage());
         } catch (Exception e) {
@@ -540,9 +551,9 @@ public class Open2DuibaController {
             JdAppEnum appEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey());
             String pin = convert2Pin(appEnum, accessToken.getAccessToken(), uid);
 
-            Result<Boolean> sendCouponResult = jdApiUtil.addCartItemByPin(appEnum, pin, itemId, num, accessToken.getAccessToken());
-            LOGGER.info("通过用户pin加入购物车,sendCouponResult={}", JSON.toJSONString(sendCouponResult));
-            return sendCouponResult;
+            Result<Boolean> result = jdApiUtil.addCartItemByPin(appEnum, pin, itemId, num, accessToken.getAccessToken());
+            LOGGER.info("通过用户pin加入购物车,result={}", JSON.toJSONString(result));
+            return result;
         } catch (BizException e) {
             return ResultBuilder.fail(e.getMessage());
         } catch (Exception e) {
@@ -567,11 +578,11 @@ public class Open2DuibaController {
             JdAppEnum appEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey());
             String pin = convert2Pin(appEnum, accessToken.getAccessToken(), uid);
 
-            Result<Boolean> sendCouponResult = jdApiUtil.sendBean(appEnum, accessToken.getAccessToken(),
+            Result<Boolean> result = jdApiUtil.sendBean(appEnum, accessToken.getAccessToken(),
                     param.getRequestId(), param.getBeanNum(), accessToken.getVenderId(),
                     param.getPlanId(), pin, param.getDesc());
-            LOGGER.info("通过用户pin加入购物车,sendCouponResult={}", JSON.toJSONString(sendCouponResult));
-            return sendCouponResult;
+            LOGGER.info("发送京豆,result={}", JSON.toJSONString(result));
+            return result;
         } catch (BizException e) {
             return ResultBuilder.fail(e.getMessage());
         } catch (Exception e) {

src/main/java/cn/com/duiba/jdactivity/developer/duiba/DuibaAppEnum.java

@@ -5,13 +5,18 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.Objects;
 
 /**
+ * 兑吧app，后续想个灵活的方式
+ *
  * @author zsp (zengshuiping@duiba.com.cn)
  * @date 2021/5/18 15:58
  */
 public enum DuibaAppEnum {
     WX("微信公众号测试", "3bRVpGghtsQXXeZpVH4VGi92Nr7V", "28Ujh91mWeKSCZ4ndDyLWf527TN1"),
+    JD_ACTIVITY_TEST("19543-京东活动测试-测试", "oZ1hxUrKW95Qn9P4BZpSGSTdUDZ", "3kQU8Rp31zifPiypTqVmujQ1h5X4"),
     TEST_4_27("4-27测试", "22KCCnB22yZihPnuB8gpqZhtdAka", "ct8j6grNJ5cCqQcN1c8sTdSEdcK"),
     BOSIDENG_PROD("波司登线上", "4EBS3taRKgKpKKSVg4xv4UnfEESh", "2hMzuvExEE7XzfThv2fbnUKxRsXA"),
+    GANGBEN_PROD("冈本-线上", "2NWc2qqfEzMoCDzFpF2q7cTPYJWc", "3dFe4VbW7PqAiTGrJiehRaVUPLUw"),
+    YITOUNIU_PROD("认养一头牛-线上", "2NWc2qqfEzMoCDzFpF2q7cTPYJWc", "3dFe4VbW7PqAiTGrJiehRaVUPLUw"),
     ;
 
 

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/JdApiUtil.java

@@ -510,7 +510,7 @@ public class JdApiUtil {
             SellerCouponWritePushCouponResponse response = client.execute(request);
             if (!CODE_SUCCESS.equals(response.getCode())) {
                 LOGGER.warn("发券失败:couponId:{},return_code:{},return_msg:{}", couponId, response.getCode(), response.getMsg());
-                return ResultBuilder.fail("发券失败：" + response.getZhDesc());
+                return ResultBuilder.fail(response.getCode(), response.getZhDesc());
             }
             LOGGER.info("发券成功：couponId:{}，pin：{}", couponId, pin);
             return ResultBuilder.success(Boolean.TRUE);