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

yshop1.8.3,H5注册新增阿里云短信功能,修复移动springsecurity 权限拦截验证问题,解决后台修改价格之后不能重复发起微信支付的问题

Browse Source
This commit is contained in:
hupeng
2020-01-15 18:34:57 +08:00
parent c020c4c190
commit e4e395ff3d
14 changed files with 174 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,11 @@ public class YxStoreOrder implements Serializable {
@Column(name = "order_id",nullable = false)
private String orderId;
// 订单号
@Column(name = "extend_order_id",nullable = true)
private String extendOrderId;
// 用户id
@Column(name = "uid",nullable = false)
private Integer uid;

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

@ -1,5 +1,7 @@
package co.yixiang.modules.shop.rest;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
@ -10,6 +12,7 @@ import co.yixiang.modules.shop.service.YxExpressService;
import co.yixiang.modules.shop.service.YxStoreOrderService;
import co.yixiang.modules.shop.service.YxStoreOrderStatusService;
import co.yixiang.modules.shop.service.dto.YxExpressDTO;
import co.yixiang.modules.shop.service.dto.YxStoreOrderDTO;
import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria;
import co.yixiang.modules.wechat.service.YxWechatUserService;
import co.yixiang.modules.wechat.service.dto.YxWechatUserDTO;
@ -236,6 +239,17 @@ public class YxStoreOrderController {
public ResponseEntity editOrder(@RequestBody YxStoreOrder resources){
if(ObjectUtil.isNull(resources.getPayPrice())) throw new BadRequestException("请输入支付金额");
if(resources.getPayPrice().doubleValue() < 0) throw new BadRequestException("金额不能低于0");
YxStoreOrderDTO storeOrder = yxStoreOrderService.findById(resources.getId());
//判断金额是否有变动,生成一个额外订单号去支付
int res = NumberUtil.compare(storeOrder.getPayPrice().doubleValue(),resources.getPayPrice().doubleValue());
if(res != 0){
String orderSn = IdUtil.getSnowflake(0,0).nextIdStr();
resources.setExtendOrderId(orderSn);
}
yxStoreOrderService.update(resources);
YxStoreOrderStatus storeOrderStatus = new YxStoreOrderStatus();