支付成功解锁/核销券

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

@@ -694,7 +694,7 @@ public class CouponAdapter {
     public MCCafeCouponLockRequest convert2MCCafeCouponLockRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, QueryOrdersResponseDto.DataBean.OrderBean.AccountBean accountBean) {
         MCCafeCouponLockRequest mcCafeCouponLockRequest = new MCCafeCouponLockRequest();
         mcCafeCouponLockRequest.setVer(Integer.valueOf(Version.VERSION_1));
-        mcCafeCouponLockRequest.setReqType(CouponReqTypeEnum.UNLOCK.getCode());
+        mcCafeCouponLockRequest.setReqType(CouponReqTypeEnum.LOCK.getCode());
         mcCafeCouponLockRequest.setPartnerId(orderBean.getCompanyId());
         mcCafeCouponLockRequest.setStoreId(orderBean.getShopId());
         // 订单号

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

@@ -480,7 +480,7 @@ public class CheckMCCafeOrder {
                     .coupon(createOrderVo.getCouponCode())
                     .sign("skip")
                     .build());
-            if (couponQueryResponse == null || !ResponseResult.SUCCESS.getCode().equals(couponQueryResponse.getStatusCode())) {
+            if (couponQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(couponQueryResponse.getStatusCode())) {
                 throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT);
             }
             String activeCode = couponQueryResponse.getCodeInfo().getAct_id();

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

@@ -986,7 +986,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         requestDto.setOpenId(orderExtInfoDto != null ? orderExtInfoDto.getOpenid() : "");
         buriedPointService.BuriedPointPayment(requestDto, orderBean);
 
-        if(OldOrderType.TAKE_OUT.equals(orderBean.getType())) {
+        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             //调用基础订单接口更新信息
             UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
             updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());

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

@@ -134,7 +134,7 @@ public class CouponClientServiceImpl implements CouponClientService {
             retry:
             for(int i=0;i<3;i++) {
                 couponRedeemResponse = redeem(request);
-                if(ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(couponRedeemResponse.getStatusCode())) {
+                if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(couponRedeemResponse.getStatusCode())) {
                     continue redeem;
                 }
             }
@@ -168,7 +168,7 @@ public class CouponClientServiceImpl implements CouponClientService {
             retry:
             for(int i=0;i<3;i++) {
                 couponRedeemResponse = redeem(request);
-                if(ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(couponRedeemResponse.getStatusCode())) {
+                if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(couponRedeemResponse.getStatusCode())) {
                     couponRedeemResponseListAll.add(couponRedeemResponse);
                     continue redeem;
                 }
@@ -229,7 +229,7 @@ public class CouponClientServiceImpl implements CouponClientService {
 
     @Override
     public CouponBaseResponse lock(MCCafeCouponLockRequest mcCafeCouponLockRequest) {
-        return null;
+        return couponOfflineMCCafeClient.lock(mcCafeCouponLockRequest);
     }
 
     @Override
@@ -254,7 +254,7 @@ public class CouponClientServiceImpl implements CouponClientService {
             retry:
             for(int i=0;i<3;i++) {
                 baseResponse = lock(request);
-                if(ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getStatusCode())) {
+                if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(baseResponse.getStatusCode())) {
                     continue lock;
                 }
             }
@@ -287,7 +287,7 @@ public class CouponClientServiceImpl implements CouponClientService {
             retry:
             for(int i=0;i<3;i++) {
                 baseResponse = lock(request);
-                if(ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getStatusCode())) {
+                if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(baseResponse.getStatusCode())) {
                     baseResponseListAll.add(baseResponse);
                     continue lock;
                 }

order-application-service/src/test/java/cn.freemud/service/CouponActivityServiceTest.java

@@ -51,11 +51,11 @@ public class CouponActivityServiceTest {
         couponCodeVerificationDto.setStation_id("1");
         couponCodeVerificationDto.setOperator_id("1");
         // 订单号
-        couponCodeVerificationDto.setTrans_id("testRedeem0729009");
+        couponCodeVerificationDto.setTrans_id("testRedeem0729011");
         couponCodeVerificationDto.setChannel("mocoffee_wx");
         List<MCCafeTransactionVo> transactions = new ArrayList<>();
         MCCafeTransactionVo mcCafeTransactionVo = new MCCafeTransactionVo();
-        mcCafeTransactionVo.setCode("281168656683188");
+        mcCafeTransactionVo.setCode("227086461372848");
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
         mcCafeProductRedeemVo.setConsume_num(1);
@@ -117,7 +117,7 @@ public class CouponActivityServiceTest {
         couponCodeVerificationDto.setStation_id("1");
         couponCodeVerificationDto.setOperator_id("1");
         couponCodeVerificationDto.setChannel("mocoffee_wx");
-        couponCodeVerificationDto.setCoupon("281168656683188");
+        couponCodeVerificationDto.setCoupon("297933023371288");
         couponCodeVerificationDto.setSign("skip");
 
         System.out.println(JSON.toJSONString(couponCodeVerificationDto));
@@ -133,9 +133,9 @@ public class CouponActivityServiceTest {
         couponCodeVerificationDto.setPartnerId("1206");
         couponCodeVerificationDto.setStoreId("99992");
         // 订单号
-        couponCodeVerificationDto.setTransId("00000002");
-        couponCodeVerificationDto.setOfferId("281168656683188");
-        couponCodeVerificationDto.setCoupon("281168656683188");
+        couponCodeVerificationDto.setTransId("18579931215294931300003");
+        couponCodeVerificationDto.setOfferId("297933023371288");
+        couponCodeVerificationDto.setCoupon("297933023371288");
         couponCodeVerificationDto.setNumber("1");
         couponCodeVerificationDto.setChannel("mocoffee_wx");
         couponCodeVerificationDto.setOperatorId("1");