cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.9.9版本,优化了公众号配置,后台新增订单分类搜索与优化了商品显示等,修复#I19S9R问题

Browse Source
This commit is contained in:
hupeng
2020-02-19 14:42:36 +08:00
parent 5e59cde9ad
commit 9017644082
7 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
View File

@ -91,6 +91,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
.eq("status",1).gt("stop_time",OrderUtil.getSecondTimestampTwo());
YxStorePink pink = yxStorePinkMapper.selectOne(wrapper);
if(pink == null) throw new ErrorRequestException("拼团不存在或已经取消");
Map<String, Object> map = getPinkMemberAndPinK(pink);
List<YxStorePink> pinkAll = (List<YxStorePink>)map.get("pinkAll");
YxStorePink pinkT = (YxStorePink)map.get("pinkT");
@ -103,7 +105,10 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
throw new ErrorRequestException("拼团已完成，无法取消");
}
//如果团长取消拼团，团队还有人，就把后面的人作为下一任团长
YxStorePink nextPinkT = pinkAll.get(0);
YxStorePink nextPinkT = null;
if(pinkAll.size() > 0){
nextPinkT = pinkAll.get(0);
}
//先退团长的money
RefundParam param = new RefundParam();

7
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
View File

@ -159,7 +159,12 @@ public class WechatController extends BaseController {
String appId = RedisUtil.get("wechat_appid");
if(StrUtil.isBlank(appId)) return "请配置公众号";
WxMpService wxService = WxMpConfiguration.getWxMpService(appId);
final WxMpService wxService = WxMpConfiguration.getWxMpService(appId);
if (wxService == null) {
throw new IllegalArgumentException(String.format("未找到对应appid=[%d]的配置，请核实！", appId));
}
if (wxService.checkSignature(timestamp, nonce, signature)) {
return echostr;
}