Просмотр исходного кода

//coupontype

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
0953b84f9a
4 измененных файлов: 11 добавлений и 11 удалений
  1. +3
    -3
      mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java

+ 3
- 3
mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java Просмотреть файл

@@ -101,9 +101,9 @@ public class AppTest {
paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id
// paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728 // paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728
paramMap.put("userPhone","18872592633");//会员手机号 paramMap.put("userPhone","18872592633");//会员手机号
paramMap.put("timeEnd","2022-09-20 17:24:00");//***积分抵扣时间
paramMap.put("amount",-10000);//***积分
paramMap.put("summary","再再扣你一万");//
paramMap.put("timeEnd","2022-09-20 17:37:00");//***积分抵扣时间
paramMap.put("amount",1000000);//***积分
paramMap.put("summary","恭喜你,获得了一百万");//


/** /**
* 参数加密并封装 * 参数加密并封装


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java Просмотреть файл

@@ -287,9 +287,9 @@ public class OrderSnapshot extends TenantEntity {
return false; return false;
} }


if(type == EnumCouponType.COUPON_CREDIT.getCode() ||
type == EnumCouponType.COUPON_CREDIT_PARK.getCode() ||
type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode()
if(type == EnumCouponType.COUPON_CREDIT.getCode()
|| type == EnumCouponType.COUPON_CREDIT_PARK.getCode()
// ||type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode()
) { ) {
return true; return true;
} }


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -417,9 +417,9 @@ public class WxCoupon extends TenantEntity {
return false; return false;
} }


if(type == EnumCouponType.COUPON_CREDIT.getCode() ||
type == EnumCouponType.COUPON_CREDIT_PARK.getCode() ||
type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode()
if(type == EnumCouponType.COUPON_CREDIT.getCode()
|| type == EnumCouponType.COUPON_CREDIT_PARK.getCode()
// ||type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode()
) { ) {
return true; return true;
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java Просмотреть файл

@@ -24,7 +24,7 @@ public enum EnumCouponType {
COUPON_GIFT(12, "券礼包"), COUPON_GIFT(12, "券礼包"),
COUPON_CREDIT(50,"积分券"), COUPON_CREDIT(50,"积分券"),
COUPON_CREDIT_PARK(51,"积分停车券"), COUPON_CREDIT_PARK(51,"积分停车券"),
COUPON_CREDIT_DOUYIN(55,"抖音积分券"),
// COUPON_CREDIT_DOUYIN(55,"抖音积分券"),


CARD_MULTIMCH(100, "消费卡"), CARD_MULTIMCH(100, "消费卡"),
; ;
@@ -67,7 +67,7 @@ public enum EnumCouponType {
public static List<Integer> getDouYinType(){ public static List<Integer> getDouYinType(){
List<Integer> typeList = new ArrayList<>(); List<Integer> typeList = new ArrayList<>();
typeList.add(COUPON_DOUYIN.getCode()); typeList.add(COUPON_DOUYIN.getCode());
typeList.add(COUPON_CREDIT_DOUYIN.getCode());
// typeList.add(COUPON_CREDIT_DOUYIN.getCode());
return typeList; return typeList;
} }




Загрузка…
Отмена
Сохранить