diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index 74d0613be..cfdce98f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -23,7 +23,7 @@ public class PasswordHelper { public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("weiyeadmin"); + user.setUsername("jnjzadmin"); user.setPassword("123456abc"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/AppAddSubMerchant.java b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/AppAddSubMerchant.java index c06c0d202..84003bf8d 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/AppAddSubMerchant.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/AppAddSubMerchant.java @@ -1,5 +1,6 @@ package com.iformall.douyin.pay.preOrder; +import com.alibaba.fastjson.JSON; import com.iformall.douyin.pay.DouYinPayHelper; import lombok.Data; @@ -25,4 +26,13 @@ public class AppAddSubMerchant { map.remove("salt"); return map; } + + public static void main(String[] args) { + AppAddSubMerchant asm = new AppAddSubMerchant(); + asm.appId = "tt2dc35b7eb2ffca5501"; + asm.salt = "SqSOtAtUWJlohxkOYlu2mFLK6nU0V5Jmmo6T5fkA"; + asm.subMerchantId = "836603215249829888"; + asm.urlType = 2; + System.out.println(JSON.toJSONString(asm.toRequestMap())); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 5ab585800..67826a598 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -99,17 +99,17 @@ public class WxMsgServiceImpl implements WxMsgService { public PageInfo listAsPage(WxMsg record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); List templist = wxMsgMapper.findList(record); - for (WxMsg temp : templist) { - - Map params = new HashMap<>(); - params.put("msgId", temp.getId().toString()); - params.put("status", "1"); - int success = wxMsgCallbackMapper.queryMsgSendTotal(params); - params.put("status", "0"); - int error = wxMsgCallbackMapper.queryMsgSendTotal(params); - temp.setSuccessNumber(success*temp.getPerCount()); - temp.setErrorNumber(error*temp.getPerCount()); - } +// for (WxMsg temp : templist) { +// +// Map params = new HashMap<>(); +// params.put("msgId", temp.getId().toString()); +// params.put("status", "1"); +// int success = wxMsgCallbackMapper.queryMsgSendTotal(params); +// params.put("status", "0"); +// int error = wxMsgCallbackMapper.queryMsgSendTotal(params); +// temp.setSuccessNumber(success*temp.getPerCount()); +// temp.setErrorNumber(error*temp.getPerCount()); +// } PageInfo pageInfo = new PageInfo<>(templist); return pageInfo;