Browse Source

businessCircle tran

release_toaliyun_real
xhxu 5 years ago
parent
commit
a20c1df798
4 changed files with 24 additions and 24 deletions
  1. +1
    -1
      mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java
  2. +21
    -21
      mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 1
- 1
mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java View File

@@ -54,7 +54,7 @@ public class UserBasicInfoController extends BaseController {
WxCUserBasicInfo userBasicInfo = wxCUserBasicInfoService.registerByPhone(tenantEntity, phone);

List<WxLevelConfig> 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) {


+ 21
- 21
mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java View File

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java View File

@@ -115,7 +115,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId {
private String level;

@TableField(exist = false)
private List<WxLevelConfig> lecelList;
private List<WxLevelConfig> levelList;

@Excel(name="积分",width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value="积分",name="credit")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -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;
}


Loading…
Cancel
Save