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

yshop1.9.2,修复修复素材库无法分页的、退款、角色等问题明细可以登陆演示后台查看

Browse Source
This commit is contained in:
hupeng
2020-01-31 18:04:56 +08:00
parent 97dbcde392
commit fd182495fb
7 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java
View File

@ -3,6 +3,8 @@ package co.yixiang.modules.shop.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
@ -13,7 +15,8 @@ import java.io.Serializable;
* @date 2019-10-03
*/
@Entity
@Data
@Getter
@Setter
@Table(name="yx_store_category")
public class YxStoreCategory implements Serializable {

31
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java
View File

@ -201,21 +201,26 @@ public class YxStoreOrderController {
//模板消息通知
String siteUrl = RedisUtil.get("site_url");
YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid());
if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService
.findByTempkey("OPENTM410119152");
Map<String,String> map = new HashMap<>();
map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。");
map.put("keyword1",resources.getOrderId());//订单号
map.put("keyword2",resources.getPayPrice().toString());
map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString()));
map.put("remark","yshop电商系统为你服务！");
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+resources.getOrderId(),map);
try{
YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid());
if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService
.findByTempkey("OPENTM410119152");
Map<String,String> map = new HashMap<>();
map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。");
map.put("keyword1",resources.getOrderId());//订单号
map.put("keyword2",resources.getPayPrice().toString());
map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString()));
map.put("remark","yshop电商系统为你服务！");
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+resources.getOrderId(),map);
}
}catch (Exception e){
log.info("当前用户不是微信用户不能发送模板消息哦!");
}
return new ResponseEntity(HttpStatus.NO_CONTENT);
}