| @@ -40,21 +40,21 @@ public class AppTest { | |||||
| * 查询用户详细信息 参数 | * 查询用户详细信息 参数 | ||||
| */ | */ | ||||
| // paramMap.put("phone","18872592633"); | // paramMap.put("phone","18872592633"); | ||||
| paramMap.put("openId","opvcM5A41kbQF_NY8k3LMDqxCDUM"); | |||||
| // paramMap.put("openId","opvcM5A41kbQF_NY8k3LMDqxCDUM"); | |||||
| /** | /** | ||||
| * 创建交易信息 参数 | * 创建交易信息 参数 | ||||
| */ | */ | ||||
| // 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","1100");//***付款金额(分) | |||||
| paramMap.put("summary","我要加积分");//付款摘要 | |||||
| /** | /** | ||||
| * 交易退款信息 参数 | * 交易退款信息 参数 | ||||
| @@ -96,13 +96,15 @@ public class AppTest { | |||||
| /** | /** | ||||
| * 注册并查询用户详细信息 接口 | * 注册并查询用户详细信息 接口 | ||||
| */ | */ | ||||
| String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/userInfo/get", headMap, JSON.toJSONString(paramMap)); | |||||
| // String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/userInfo/get", headMap, JSON.toJSONString(paramMap)); | |||||
| /** | /** | ||||
| * 创建交易信息 接口 | * 创建交易信息 接口 | ||||
| */ | */ | ||||
| // 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)); | |||||
| // String s = HttpUtil.doPost("http://localhost:7070/public/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); | |||||
| /** | /** | ||||
| * 交易退款 接口 | * 交易退款 接口 | ||||
| @@ -7,7 +7,7 @@ import java.util.List; | |||||
| public interface TtUserFollowMapper extends CommonMapper<TtUserFollow, Long> { | public interface TtUserFollowMapper extends CommonMapper<TtUserFollow, Long> { | ||||
| List<TtUserFollow> findList(TtUserFollow collect); | |||||
| List<TtUserFollow> findList(TtUserFollow follow); | |||||
| int deleteById(Long id); | int deleteById(Long id); | ||||
| @@ -162,5 +162,5 @@ public interface WxMerchantService { | |||||
| List<Long> getMerchantShopIds(Long merchantId); | List<Long> getMerchantShopIds(Long merchantId); | ||||
| @Async | @Async | ||||
| void collectCoupon(TenantEntity tenantInfo, Long memberId, Long id); | |||||
| void followMerchern(TenantEntity tenantInfo, Long memberId, Long id); | |||||
| } | } | ||||
| @@ -945,7 +945,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void collectCoupon(TenantEntity tenantEntity, Long memberId, Long id) { | |||||
| public void followMerchern(TenantEntity tenantEntity, Long memberId, Long id) { | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| TtUserFollow userFollow = new TtUserFollow(); | TtUserFollow userFollow = new TtUserFollow(); | ||||
| userFollow.setId(idWorker.nextId()); | userFollow.setId(idWorker.nextId()); | ||||
| @@ -30,7 +30,7 @@ public class TtCouponController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize, Integer dataType) { | |||||
| public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) { | |||||
| logger.debug("[" + getIpAddr() + "] TtCouponController::list"); | logger.debug("[" + getIpAddr() + "] TtCouponController::list"); | ||||
| if (record == null) record = new TtCoupon(); | if (record == null) record = new TtCoupon(); | ||||
| record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); | record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); | ||||
| @@ -92,7 +92,7 @@ public class WxMerchantController extends BaseController { | |||||
| return new ResultData(e.getErrorCode(), e.getMessage()); | return new ResultData(e.getErrorCode(), e.getMessage()); | ||||
| } | } | ||||
| wxMerchantService.collectCoupon(getTenantInfo(),memberId,byId.getId()); | |||||
| wxMerchantService.followMerchern(getTenantInfo(),memberId,byId.getId()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||