From a20c1df798b6860426fccdbd7caef244031e0dbd Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 6 May 2021 10:22:40 +0800 Subject: [PATCH] businessCircle tran --- .../controller/UserBasicInfoController.java | 2 +- .../main/java/com/iformall/utils/AppTest.java | 42 +++++++++---------- .../iformall/domain/po/WxCUserBasicInfo.java | 2 +- .../service/impl/WxMerchantServiceImpl.java | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java index 5792c29c4..227def7c5 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java @@ -54,7 +54,7 @@ public class UserBasicInfoController extends BaseController { WxCUserBasicInfo userBasicInfo = wxCUserBasicInfoService.registerByPhone(tenantEntity, phone); List levelList = wxLevelConfigService.getByTenantInfo(tenantEntity); - userBasicInfo.setLecelList(levelList); + userBasicInfo.setLevelList(levelList); userBasicInfo.setLevel(WxLevelConfigService.DEFAULT_LEVEL); if(userBasicInfo.getPoins() != null && userBasicInfo.getPoins() > 0){ for (WxLevelConfig levelConfig : levelList) { diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 1b2685819..43793d06a 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -31,20 +31,20 @@ public class AppTest { /** * 注册并查询用户详细信息 参数 */ -// paramMap.put("phone","17600293031"); +// paramMap.put("phone","18872592633"); /** * 创建交易信息 参数 */ - IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","546907706202185728");//***会员Id - paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","1000");//***付款金额(分) - paramMap.put("summary","我要加积分");//付款摘要 +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","546907706202185728");//***会员Id +// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("amount","1000");//***付款金额(分) +// paramMap.put("summary","我要加积分");//付款摘要 /** * 交易退款信息 参数 @@ -59,15 +59,15 @@ public class AppTest { /** * 积分抵扣 参数 */ -// IdWorker idWorker = IdWorker.get(); -// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id -// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 -// paramMap.put("shopName","百丽");//门店名称 -// paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 -// paramMap.put("userPhone","18872592633");//会员手机号 -// paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 -// paramMap.put("amount","100");//***付款金额(分) -// paramMap.put("summary","我要换东西");//付款摘要 + IdWorker idWorker = IdWorker.get(); + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 + paramMap.put("userPhone","18872592633");//会员手机号 + paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 + paramMap.put("amount","100");//***付款金额(分) + paramMap.put("summary","我要换东西");//付款摘要 /** @@ -86,7 +86,7 @@ public class AppTest { /** * 创建交易信息 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); /** * 交易退款 接口 @@ -96,7 +96,7 @@ public class AppTest { /** * 交易退款 接口 */ -// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); System.out.println(s); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 8a391e36d..3876c2909 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -115,7 +115,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { private String level; @TableField(exist = false) - private List lecelList; + private List levelList; @Excel(name="积分",width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index e1bc15371..9e16d85c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -784,7 +784,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public boolean hasMerchantEncode(WxMerchant wxMerchant) { if(StringUtils.isBlank(wxMerchant.getEncode())){ - return true; + return false; }else{ return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; }