cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
moxiangrong
2024-03-05 14:38:24 +08:00
parent 09d4fd81c5
commit 912be34a6e
17 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/api/RechargeOrderApiImpl.java
View File

@ -48,6 +48,7 @@ public class RechargeOrderApiImpl implements RechargeOrderApi {
increaseNowMoneyDTO.setId(rechargeOrder.getUserId());
increaseNowMoneyDTO.setAmount(new BigDecimal(rechargeOrder.getRechargeAmount()));
increaseNowMoneyDTO.setLink(orderId);
increaseNowMoneyDTO.setTitle("充值");
increaseNowMoneyDTO.setMark("微信支付充值" + rechargeOrder.getRechargeAmount() + "元");
memberUserNowMoneyApi.increaseNowMoney(increaseNowMoneyDTO);
@ -57,6 +58,7 @@ public class RechargeOrderApiImpl implements RechargeOrderApi {
increaseNowMoneyDTO.setId(rechargeOrder.getUserId());
increaseNowMoneyDTO.setAmount(new BigDecimal(rechargeOrder.getGiftAmount()));
increaseNowMoneyDTO.setLink(orderId);
increaseNowMoneyDTO.setTitle("充值赠送");
increaseNowMoneyDTO.setMark("充值赠送" + rechargeOrder.getGiftAmount() + "元");
memberUserNowMoneyApi.increaseNowMoney(increaseNowMoneyDTO);

16
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/controller/app/rechargeorder/AppRechargeOrderController.java
View File

@ -4,15 +4,13 @@ import co.yixiang.yshop.framework.common.pojo.CommonResult;
import co.yixiang.yshop.framework.security.core.annotations.PreAuthenticated;
import co.yixiang.yshop.module.order.controller.app.rechargeorder.vo.AppRechargeOrderCreateReqVO;
import co.yixiang.yshop.module.order.service.rechargeorder.RechargeFacade;
import co.yixiang.yshop.module.order.service.rechargeorder.RechargeOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@ -29,10 +27,20 @@ public class AppRechargeOrderController {
@Resource
private RechargeFacade rechargeFacade;
@Resource
private RechargeOrderService rechargeOrderService;
@PreAuthenticated
@PostMapping(value = "/create")
@Operation(summary = "充值")
public CommonResult<String> create(@Valid @RequestBody AppRechargeOrderCreateReqVO createReqVO) throws Exception {
return success(rechargeFacade.create(createReqVO));
}
@PreAuthenticated
@GetMapping(value = "/isPay")
@Operation(summary = "支付结果查询")
public CommonResult<Integer> isPay(@Valid String id){
return success(rechargeOrderService.isPay(id));
}
}

7
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/rechargeorder/RechargeOrderService.java
View File

@ -70,4 +70,11 @@ public interface RechargeOrderService {
void refund() throws Exception;
/**
* 支付结果查询
* @param id
* @return
*/
Integer isPay(String id);
}

10
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/rechargeorder/RechargeOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package co.yixiang.yshop.module.order.service.rechargeorder;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.framework.mybatis.core.util.MyBatisUtils;
import co.yixiang.yshop.module.member.api.user.MemberUserApi;
@ -142,4 +143,13 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
}
@Override
public Integer isPay(String id) {
RechargeOrderDO orderDO = getRechargeOrder(id);
if (ObjectUtil.isNull(orderDO)) {
throw exception(RECHARGE_ORDER_NOT_EXISTS);
}
return getRechargeOrder(id).getStatus();
}
}

10
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java
View File

@ -1454,9 +1454,11 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, Stor
updateOrderDO.setId(orderQueryVo.getId());
// 修改明细状态，并获取订单下一步状态
updateOrderDO.setRefundStatus(orderDetailService.updateState(param.getAfterSalesId(), orderQueryVo.getId()));
// 处理拼团订单
// 处理待拼团订单
if (ObjectUtil.isNotNull(orderQueryVo.getCampaignType()) &&
CampaignTypeEnum.TEAMWORK.getValue().equals(orderQueryVo.getCampaignType())) {
CampaignTypeEnum.TEAMWORK.getValue().equals(orderQueryVo.getCampaignType())
&& OrderInfoEnum.STATUS_WAIT_GROUP.getValue().equals(orderQueryVo.getStatus())
) {
teamworkInfoService.refundHandle(new TeamworkRefundParam()
.setUid(orderQueryVo.getUid()).setId(orderQueryVo.getTeamworkId()));
}
@ -1606,8 +1608,8 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, Stor
OrderInfoEnum.PAY_STATUS_HAVE_PAID.getValue().equals(order.getPaid())).count();
// 计算待付款订单数
Long unpaidCount = storeOrderDOS.stream().filter(order ->
OrderInfoEnum.PAY_STATUS_UNPAID.getValue().equals(order.getPaid()) &&
OrderInfoEnum.STATUS_DEFAULT.getValue().equals(order.getStatus())).count();
OrderInfoEnum.PAY_STATUS_UNPAID.getValue().equals(order.getPaid()) &&
OrderInfoEnum.STATUS_DEFAULT.getValue().equals(order.getStatus())).count();
// 计算待发货订单数
Long unshippedCount = storeOrderDOS.stream().filter(order ->
OrderInfoEnum.PAY_STATUS_HAVE_PAID.getValue().equals(order.getPaid()) &&