merge

luodangjia

2024-11-04 e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -5,9 +5,11 @@
import java.time.LocalDateTime;


import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.account.api.feignClient.AppUserAddressClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.domain.R;
@@ -80,6 +82,13 @@
   private SysUserClient sysUserClient;
   @Resource
   private TShoppingOrderRefundService shoppingOrderRefundService;
   @Resource
   private AppUserAddressClient appUserAddressClient;
	
	
	
	
	
   /**
    * 远程管理后台取消订单后退款回调
    */
@@ -182,7 +191,7 @@
      // todo 根据支付方式 取消订单
      byId.setCancellationId(userid);
      byId.setCancellationTime(LocalDateTime.now());
      byId.setStatus(4);
      byId.setStatus(5);
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      TShoppingOrderRefund tShoppingOrderRefund = new TShoppingOrderRefund();
      tShoppingOrderRefund.setPayTime(byId.getPayTime());
@@ -281,11 +290,11 @@
   public AjaxResult<Map<String, Object>> getMyShoppingOrderListNum() {
      Long userId = tokenService.getLoginUserApplet().getUserId();
      long dfh = shoppingOrderService.count(new LambdaQueryWrapper<TShoppingOrder>().eq(TShoppingOrder::getDelFlag, 0)
            .eq(TShoppingOrder::getStatus, 1).eq(TShoppingOrder::getAppUserId, userId));
            .eq(TShoppingOrder::getStatus, 1).eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2));
      long dsh = shoppingOrderService.count(new LambdaQueryWrapper<TShoppingOrder>().eq(TShoppingOrder::getDelFlag, 0)
            .eq(TShoppingOrder::getStatus, 2).eq(TShoppingOrder::getAppUserId, userId));
            .eq(TShoppingOrder::getStatus, 2).eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2));
      long ywc = shoppingOrderService.count(new LambdaQueryWrapper<TShoppingOrder>().eq(TShoppingOrder::getDelFlag, 0)
            .eq(TShoppingOrder::getStatus, 3).eq(TShoppingOrder::getAppUserId, userId));
            .eq(TShoppingOrder::getStatus, 3).eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2));
      Map<String, Object> map = new HashMap<>();
      map.put("dfh", dfh);
      map.put("dsh", dsh);
@@ -316,6 +325,7 @@
         return AjaxResult.error("订单已取消，不允许操作。");
      }
      shoppingOrder.setStatus(3);
      shoppingOrder.setReceivingTime(LocalDateTime.now());
      shoppingOrderService.updateById(shoppingOrder);
      return AjaxResult.success();
   }
@@ -331,15 +341,11 @@
    * 商城订单取消微信退款回调
    */
   @PostMapping("/cancelShoppingOrderWxRefund")
   public void cancelShoppingOrderWxRefund(HttpServletRequest request) {
//      WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
//      if (null != data) {
//         String out_refund_no = data.getOut_refund_no();
//         String refund_id = data.getRefund_id();
//         String tradeState = data.getTradeState();
//         String success_time = data.getSuccess_time();
//         shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
//      }
   public void cancelShoppingOrderWxRefund(@RequestParam("out_refund_no") String out_refund_no,
                                           @RequestParam("refund_id") String refund_id,
                                           @RequestParam("tradeState") String tradeState,
                                           @RequestParam("success_time") String success_time) {
      shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
   }
   
   
@@ -350,6 +356,7 @@
      List<MyShoppingOrderList> list = shoppingOrderService.getNoInvoicedOrder(query);
      return AjaxResult.success(list);
   }

   
   @PostMapping("/create")
   public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto) {
@@ -360,8 +367,12 @@
      shoppingOrder.setOrderType(exchangeDto.getGoodType());
      if (exchangeDto.getGoodType() == 1) {
         shoppingOrder.setGoodsId(exchangeDto.getGoodId());
         shoppingOrder.setStatus(1);

      } else {
         shoppingOrder.setCouponId(exchangeDto.getGoodId());
         shoppingOrder.setStatus(3);

      }
      shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
      shoppingOrder.setAppUserAddressId(exchangeDto.getAddressId());
@@ -376,10 +387,13 @@
      shoppingOrder.setPaymentStatus(1);
      shoppingOrder.setPaymentType(exchangeDto.getPayMethod());
      shoppingOrder.setRemark(exchangeDto.getRemark());
      shoppingOrder.setStatus(1);
      shoppingOrder.setPhone(exchangeDto.getPhone());
      shoppingOrder.setCreateTime(LocalDateTime.now());
      shoppingOrder.setDelFlag(false);


      TAppUserAddress data = appUserAddressClient.getAppUserAddressById(exchangeDto.getAddressId()).getData();
      shoppingOrder.setAddressJson(JSON.toJSONString(data));
      shoppingOrderService.save(shoppingOrder);
      
      return R.ok(shoppingOrder);