zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单添加状态

Browse Source
This commit is contained in:
seesaw
2024-10-31 17:02:42 +08:00
parent b08f0e2cd7
commit 75d5f513d5
7 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java
View File

@ -44,4 +44,7 @@ public class StoreOrderPageVO extends PageParam {
@Schema(description = "门店", example = "1722")
private Long carteenId;
@Schema(description = "订单状态", example = "1722")
private Integer status;
}

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
View File

@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.member.controller.app.store.vo.UserInfoVo;
import cn.iocoder.yudao.module.member.dal.dataobject.storegoods.StoreGoodsDO;
import cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype.StoreGoodsTypeDO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.member.enums.StoreOrderStatusEnum;
import cn.iocoder.yudao.module.member.service.storegoods.StoreGoodsService;
import cn.iocoder.yudao.module.member.service.storegoodstype.StoreGoodsTypeService;
import cn.iocoder.yudao.module.member.service.storeorder.StoreOrderService;
@ -127,7 +128,7 @@ public class AppStoreController {
@PostMapping("/mgcr/order/paymentCodePayOrder")
@Operation(summary = "创建刷脸支付订单")
public String paymentCodePayOrder(@RequestBody StoreOrderDto dto) {
Integer order = orderService.createOrder(dto).getOrderId();
Integer order = orderService.createOrder(dto, StoreOrderStatusEnum.TO_PAY.getCode()).getOrderId();
HashMap<String, Integer> map = new HashMap<>();
map.put("orderId", order);
return JsonUtils.toJsonString(StoreResult.success(map));

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java
View File

@ -64,4 +64,9 @@ public class StoreOrderDO extends BaseDO {
*/
private Long carteenId;
/**
* （1-已支付，2-已完成，3-已取消，4-已退款）
*/
private Integer status;
}

29
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/StoreOrderStatusEnum.java Normal file
View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.member.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 代码生成的场景枚举
*
* @author 芋道源码
*/
@AllArgsConstructor
@Getter
public enum StoreOrderStatusEnum {
TO_PAY(0,"待支付"),
PAY(1, "已支付"),
COMPLETE(2, "已完成"),
CANCEL(3, "已取消"),
REFUND(4, "已退款"),
;
/**
* 编码
*/
private final Integer code;
/**
* 类型
*/
private final String name;
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderService.java
View File

@ -58,7 +58,7 @@ public interface StoreOrderService {
*/
PageResult<StoreOrderDO> getStoreOrderPage(StoreOrderPageReqVO pageReqVO);
StoreOrderDO createOrder(StoreOrderDto dto);
StoreOrderDO createOrder(StoreOrderDto dto,Integer status);
UserInfoVo facePay(FacePayDto dto);

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java
View File

@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrder
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.member.dal.mysql.storeorder.StoreOrderMapper;
import cn.iocoder.yudao.module.member.enums.CostTypeEnum;
import cn.iocoder.yudao.module.member.enums.StoreOrderStatusEnum;
import cn.iocoder.yudao.module.member.enums.TimePeriodEnum;
import cn.iocoder.yudao.module.member.service.amount.DeductionService;
import cn.iocoder.yudao.module.member.service.card.CardService;
@ -124,7 +125,7 @@ public class StoreOrderServiceImpl implements StoreOrderService {
@Override
@Transactional(rollbackFor = Exception.class)
public StoreOrderDO createOrder(StoreOrderDto dto) {
public StoreOrderDO createOrder(StoreOrderDto dto,Integer status) {
StoreOrderDO storeOrderDO = new StoreOrderDO();
Long storeId = cashregisterinfoApi.getStoreId(dto.getEquipmentCode());
BeanUtil.copyProperties(dto, storeOrderDO);
@ -132,6 +133,7 @@ public class StoreOrderServiceImpl implements StoreOrderService {
double sum = equipmentGoodsCustoms.stream()
.mapToDouble(StoreGoodsDto::getTotalPrice)
.sum();
storeOrderDO.setStatus(status);
storeOrderDO.setTotalPrice(sum);
storeOrderDO.setCarteenId(storeId);
storeOrderMapper.insert(storeOrderDO);
@ -171,7 +173,7 @@ public class StoreOrderServiceImpl implements StoreOrderService {
return "该卡未绑定用户";
}
dto.setUserId(userDO.getId());
Double totalPrice = createOrder(dto).getTotalPrice();
Double totalPrice = createOrder(dto, StoreOrderStatusEnum.COMPLETE.getCode()).getTotalPrice();
BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP);
BigDecimal compute = compute(total, userDO.getId());
@ -192,7 +194,7 @@ public class StoreOrderServiceImpl implements StoreOrderService {
}
MemberUserDO user = userService.getUser(Long.valueOf(s));
dto.setUserId(user.getId());
StoreOrderDO order = createOrder(dto);
StoreOrderDO order = createOrder(dto,StoreOrderStatusEnum.COMPLETE.getCode());
Double totalPrice = order.getTotalPrice();
BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP);

2
yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml
View File

@ -11,7 +11,7 @@
<select id="getStoreOrderPageNew"
resultType="cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderPageVO">
select so.order_id,so.total_price,so.create_time,mu.nickname,mu.mobile,so.reduction_price,so.carteen_id
select so.order_id,so.total_price,so.create_time,mu.nickname,mu.mobile,so.reduction_price,so.carteen_id,so.status
from member_store_order so
left join member_user mu on so.user_id = mu.id
<where>