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

1.4.5 bug修复版本：修复商品详情优惠券不显示,修复后台发货与退款判断冲突,修复公众号提示服务器出现故障的问题

Browse Source
This commit is contained in:
hupeng
2019-12-15 21:19:41 +08:00
parent a060e73e39
commit addcb683f3
10 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ public class YxStoreOrder implements Serializable {
// 快递名称/送货人姓名
@Column(name = "delivery_name")
@NotBlank(message = "请选择快递公司")
//@NotBlank(message = "请选择快递公司")
private String deliveryName;
@Column(name = "delivery_sn")
@ -146,7 +146,7 @@ public class YxStoreOrder implements Serializable {
// 快递单号/手机号
@Column(name = "delivery_id")
@NotBlank(message = "快递单号不能为空")
//@NotBlank(message = "快递单号不能为空")
private String deliveryId;
// 消费赚取积分

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

@ -139,7 +139,8 @@ public class YxStoreOrderController {
@PutMapping(value = "/yxStoreOrder")
@PreAuthorize("hasAnyRole('ADMIN','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')")
public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources){
if(StrUtil.isBlank(resources.getDeliveryName())) throw new BadRequestException("请选择快递公司");
if(StrUtil.isBlank(resources.getDeliveryId())) throw new BadRequestException("快递单号不能为空");
YxExpressDTO expressDTO = yxExpressService.findById(Integer.valueOf(resources
.getDeliveryName()));
if(ObjectUtil.isNull(expressDTO)){