Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 75ec232b4f96ddb3bf59482adb7ad26e573cd9b6

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

@@ -88,47 +88,44 @@
      return AjaxResult.success(list);
   }

//   @PostMapping("/create")
//   public R<Long> shopCreate(@RequestBody ExchangeDto exchangeDto){
//      TShoppingOrder shoppingOrder = new TShoppingOrder();
//      shoppingOrder.setCode(OrderCodeUtil.getOrderCode("GW"));
//      shoppingOrder.setAppUserId(exchangeDto.getUserId());
//      shoppingOrder.setOrderType(exchangeDto.getGoodType());
//      if (exchangeDto.getGoodType()==1) {
//         shoppingOrder.setGoodsId(exchangeDto.getGoodId());
//      }else {
//         shoppingOrder.setCouponId(exchangeDto.getGoodId());
//      }
//      shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
//      shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
//      shoppingOrder.setOrderAmount(new BigDecimal("0"));
//      shoppingOrder.setAppCouponId(0L);
//      shoppingOrder.setCouponDiscountAmount(new BigDecimal("0"));
//      shoppingOrder.setVipDiscount(new BigDecimal("0"));
//      shoppingOrder.setVipDiscountAmount(new BigDecimal("0"));
//      shoppingOrder.setPaymentAmount(new BigDecimal("0"));
//      shoppingOrder.setPaymentStatus(0);
//      shoppingOrder.setPaymentType(0);
//      shoppingOrder.setSerialNumber("");
//      shoppingOrder.setRemark("");
//      shoppingOrder.setStatus(0);
//      shoppingOrder.setExpressCompany("");
//      shoppingOrder.setExpressNumber("");
//      shoppingOrder.setConsignerId(0);
//      shoppingOrder.setConsignerTime(LocalDateTime.now());
//      shoppingOrder.setReceivingTime(LocalDateTime.now());
//      shoppingOrder.setCancellationTime(LocalDateTime.now());
//      shoppingOrder.setCancellationId(0);
//      shoppingOrder.setRefundCode("");
//      shoppingOrder.setRefundAmount(new BigDecimal("0"));
//      shoppingOrder.setRefundStatus(0);
//      shoppingOrder.setRefundSerialNumber("");
//      shoppingOrder.setRefundTime(LocalDateTime.now());
//      shoppingOrder.setCreateTime(LocalDateTime.now());
//      shoppingOrder.setDelFlag(false);
//
//
//
//   }
   @PostMapping("/create")
   public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto){
      TShoppingOrder shoppingOrder = new TShoppingOrder();
      shoppingOrder.setCode(OrderCodeUtil.getOrderCode("GW"));
      shoppingOrder.setAppUserId(exchangeDto.getUserId());
      shoppingOrder.setOrderType(exchangeDto.getGoodType());
      if (exchangeDto.getGoodType()==1) {
         shoppingOrder.setGoodsId(exchangeDto.getGoodId());
      }else {
         shoppingOrder.setCouponId(exchangeDto.getGoodId());
      }
      shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
      shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
      shoppingOrder.setOrderAmount(exchangeDto.getOrderPrice());
      if (exchangeDto.getCouponId()!=null) {
         shoppingOrder.setAppCouponId(exchangeDto.getCouponId());
      }
      shoppingOrder.setCouponDiscountAmount(exchangeDto.getDiscountPrice());
      shoppingOrder.setVipDiscount(new BigDecimal("0"));
      shoppingOrder.setVipDiscountAmount(exchangeDto.getVipDiscount());
      shoppingOrder.setPaymentAmount(exchangeDto.getPayPrice());
      shoppingOrder.setPaymentStatus(1);
      shoppingOrder.setPaymentType(exchangeDto.getPayMethod());
      shoppingOrder.setRemark(exchangeDto.getRemark());
      shoppingOrder.setStatus(1);
      shoppingOrder.setCreateTime(LocalDateTime.now());
      shoppingOrder.setDelFlag(false);
      shoppingOrderService.save(shoppingOrder);

      return R.ok(shoppingOrder);

   }

   @PostMapping("/callBack")
   public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
      shoppingOrderService.callBack(code,outTradeNo);
      return R.ok();

   }
}