xiaoshou改

xingyun-api/src/main/java/com/lframework/xingyun/api/XingYunApiApplication.java

@@ -24,7 +24,7 @@ public class XingYunApiApplication {
 
   public static void main(String[] args) {
 
-    SpringApplication.run(XingYunApiApplication.class, args);
+        SpringApplication.run(XingYunApiApplication.class, args);
   }
 
   /**

xingyun-api/src/main/resources/application.yml

@@ -103,7 +103,7 @@ jugg:
     #  cacheName2: 7200
   #开启多租户
   tenant:
-    enabled: true
+    enabled: false
   #开启websocket
   ws:
     enabled: true

xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOrderController.java

@@ -219,9 +219,9 @@ public class SaleOrderController extends DefaultBaseController {
    * 创建订单
    */
   @ApiOperation("创建订单")
-  @HasPermission({"sale:order:add"})
+//  @HasPermission({"sale:order:add"})
   @PostMapping
-  public InvokeResult<String> create(@RequestBody @Valid CreateSaleOrderVo vo) {
+  public InvokeResult<String> create(@RequestBody   CreateSaleOrderVo vo) {
 
     vo.validate();
 
@@ -230,6 +230,9 @@ public class SaleOrderController extends DefaultBaseController {
     return InvokeResultBuilder.success(id);
   }
 
+
+
+
   /**
    * 修改订单
    */

xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportModel.java

@@ -167,7 +167,7 @@ public class SaleOrderExportModel extends BaseBo<SaleOrder> implements ExcelMode
             this.setSalerName(saler.getName());
         }
         this.setTotalNum(dto.getTotalNum());
-        this.setGiftNum(dto.getTotalGiftNum());
+      //  this.setGiftNum(dto.getTotalGiftNum());
         this.setTotalAmount(dto.getTotalAmount());
         this.setDescription(dto.getDescription());
         this.setCreateTime(DateUtil.toDate(dto.getCreateTime()));

xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java

@@ -580,12 +580,12 @@ public class SaleOrderServiceImpl extends BaseMpServiceImpl<SaleOrderMapper, Sal
     }
 
     order.setScId(vo.getScId());
-    order.setPlanId(vo.getPlanId());
-    Customer customer = customerService.findById(vo.getCustomerId());
-    if (customer == null) {
-      throw new InputErrorException("客户不存在！");
-    }
-    order.setCustomerId(vo.getCustomerId());
+  //  order.setPlanId(vo.getPlanId());
+//    Customer customer = customerService.findById(vo.getCustomerId());
+//    if (customer == null) {
+//      throw new InputErrorException("客户不存在！");
+//    }
+  //  order.setCustomerId(vo.getCustomerId());
 
     if (!StringUtil.isBlank(vo.getSalerId())) {
       UserDto saler = userService.findById(vo.getSalerId());
@@ -628,71 +628,71 @@ public class SaleOrderServiceImpl extends BaseMpServiceImpl<SaleOrderMapper, Sal
 
       orderDetail.setProductId(productVo.getProductId());
       orderDetail.setOrderNum(productVo.getOrderNum());
-      orderDetail.setOriPrice(productVo.getOriPrice());
-      orderDetail.setDiscountRate(productVo.getDiscountRate());
-      orderDetail.setTaxPrice(productVo.getTaxPrice());
-      orderDetail.setIsGift(isGift);
-      orderDetail.setTaxRate(product.getSaleTaxRate());
+     // orderDetail.setOriPrice(productVo.getOriPrice());
+   //   orderDetail.setDiscountRate(productVo.getDiscountRate());
+    //  orderDetail.setTaxPrice(productVo.getTaxPrice());
+    //  orderDetail.setIsGift(isGift);
+     // orderDetail.setTaxRate(product.getSaleTaxRate());
       orderDetail.setDescription(
           StringUtil.isBlank(productVo.getDescription()) ? StringPool.EMPTY_STR
               : productVo.getDescription());
       orderDetail.setOrderNo(orderNo);
 
-      saleOrderDetailService.save(orderDetail);
-
-      // 这里处理组合商品
-      if (product.getProductType() == ProductType.BUNDLE) {
-        List<ProductBundle> productBundles = productBundleService.getByMainProductId(
-            product.getId());
-        // 构建指标项
-        Map<Object, Number> bundleWeight = new HashMap<>(productBundles.size());
-        for (ProductBundle productBundle : productBundles) {
-          bundleWeight.put(productBundle.getProductId(),
-              NumberUtil.mul(productBundle.getSalePrice(), productBundle.getBundleNum()));
-        }
-        Map<Object, Number> splitPriceMap = SplitNumberUtil.split(orderDetail.getTaxPrice(),
-            bundleWeight, 2);
-        List<SaleOrderDetailBundle> saleOrderDetailBundles = productBundles.stream()
-            .map(productBundle -> {
-              Product bundle = productService.findById(productBundle.getProductId());
-              SaleOrderDetailBundle saleOrderDetailBundle = new SaleOrderDetailBundle();
-              saleOrderDetailBundle.setId(IdUtil.getId());
-              saleOrderDetailBundle.setOrderId(order.getId());
-              saleOrderDetailBundle.setDetailId(orderDetail.getId());
-              saleOrderDetailBundle.setMainProductId(product.getId());
-              saleOrderDetailBundle.setOrderNum(orderDetail.getOrderNum());
-              saleOrderDetailBundle.setProductId(productBundle.getProductId());
-              saleOrderDetailBundle.setProductOrderNum(
-                  NumberUtil.mul(orderDetail.getOrderNum(), productBundle.getBundleNum())
-                      .intValue());
-              saleOrderDetailBundle.setProductOriPrice(productBundle.getSalePrice());
-              // 这里会有尾差
-              saleOrderDetailBundle.setProductTaxPrice(NumberUtil.getNumber(NumberUtil.div(
-                  BigDecimal.valueOf(
-                      splitPriceMap.get(productBundle.getProductId()).doubleValue()), productBundle.getBundleNum()), 2));
-              saleOrderDetailBundle.setProductTaxRate(bundle.getSaleTaxRate());
-
-              return saleOrderDetailBundle;
-            }).collect(Collectors.toList());
-
-        saleOrderDetailBundleService.saveBatch(saleOrderDetailBundles);
-      }
+   boolean rrr=   saleOrderDetailService.save(orderDetail);
+
+//      // 这里处理组合商品
+//      if (product.getProductType() == ProductType.BUNDLE) {
+//        List<ProductBundle> productBundles = productBundleService.getByMainProductId(
+//            product.getId());
+//        // 构建指标项
+//        Map<Object, Number> bundleWeight = new HashMap<>(productBundles.size());
+//        for (ProductBundle productBundle : productBundles) {
+//          bundleWeight.put(productBundle.getProductId(),
+//              NumberUtil.mul(productBundle.getSalePrice(), productBundle.getBundleNum()));
+//        }
+//        Map<Object, Number> splitPriceMap = SplitNumberUtil.split(orderDetail.getTaxPrice(),
+//            bundleWeight, 2);
+//        List<SaleOrderDetailBundle> saleOrderDetailBundles = productBundles.stream()
+//            .map(productBundle -> {
+//              Product bundle = productService.findById(productBundle.getProductId());
+//              SaleOrderDetailBundle saleOrderDetailBundle = new SaleOrderDetailBundle();
+//              saleOrderDetailBundle.setId(IdUtil.getId());
+//              saleOrderDetailBundle.setOrderId(order.getId());
+//              saleOrderDetailBundle.setDetailId(orderDetail.getId());
+//              saleOrderDetailBundle.setMainProductId(product.getId());
+//              saleOrderDetailBundle.setOrderNum(orderDetail.getOrderNum());
+//              saleOrderDetailBundle.setProductId(productBundle.getProductId());
+//              saleOrderDetailBundle.setProductOrderNum(
+//                  NumberUtil.mul(orderDetail.getOrderNum(), productBundle.getBundleNum())
+//                      .intValue());
+//              saleOrderDetailBundle.setProductOriPrice(productBundle.getSalePrice());
+//              // 这里会有尾差
+//              saleOrderDetailBundle.setProductTaxPrice(NumberUtil.getNumber(NumberUtil.div(
+//                  BigDecimal.valueOf(
+//                      splitPriceMap.get(productBundle.getProductId()).doubleValue()), productBundle.getBundleNum()), 2));
+//              saleOrderDetailBundle.setProductTaxRate(bundle.getSaleTaxRate());
+//
+//              return saleOrderDetailBundle;
+//            }).collect(Collectors.toList());
+//
+//        saleOrderDetailBundleService.saveBatch(saleOrderDetailBundles);
+//      }
       orderNo++;
     }
     order.setTotalNum(totalNum);
-    order.setTotalGiftNum(giftNum);
-    order.setTotalAmount(totalAmount);
+  //  order.setTotalGiftNum(giftNum);
+  //  order.setTotalAmount(totalAmount);
     order.setDescription(
         StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription());
 
-    orderPayTypeService.create(order.getId(), vo.getPayTypes());
+   // orderPayTypeService.create(order.getId(), vo.getPayTypes());
   }
 
   private void sendApprovePassEvent(SaleOrder order) {
 
     ApprovePassSaleOrderEvent event = new ApprovePassSaleOrderEvent(this);
     event.setId(order.getId());
-    event.setTotalAmount(order.getTotalAmount());
+   // event.setTotalAmount(order.getTotalAmount());
     event.setApproveTime(order.getApproveTime());
     event.setCreateUser(order.getCreateById());
     ApplicationUtil.publishEvent(event);

xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/CreateSaleOrderVo.java

@@ -23,9 +23,9 @@ public class CreateSaleOrderVo implements BaseVo, Serializable {
   /**
    * 仓库ID
    */
-  @ApiModelProperty(value = "销售计划ID")
-
-  private String planId;
+//  @ApiModelProperty(value = "销售计划ID")
+//
+//  private String planId;
 
 
   /**
@@ -39,7 +39,7 @@ public class CreateSaleOrderVo implements BaseVo, Serializable {
    * 客户ID
    */
   @ApiModelProperty(value = "客户ID", required = true)
-  @NotBlank(message = "客户ID不能为空！")
+//  @NotBlank(message = "客户ID不能为空！")
   private String customerId;
 
   /**
@@ -56,12 +56,12 @@ public class CreateSaleOrderVo implements BaseVo, Serializable {
   @NotEmpty(message = "商品不能为空！")
   private List<SaleProductVo> products;
 
-  /**
-   * 支付方式
-   */
-  @ApiModelProperty("约定支付")
-  @Valid
-  private List<OrderPayTypeVo> payTypes;
+//  /**
+//   * 支付方式
+//   */
+//  @ApiModelProperty("约定支付")
+////  @Valid
+//  private List<OrderPayTypeVo> payTypes;
 
   /**
    * 备注
@@ -85,40 +85,40 @@ public class CreateSaleOrderVo implements BaseVo, Serializable {
       if (product.getOrderNum() <= 0) {
         throw new InputErrorException("第" + orderNo + "行商品销售数量必须大于0！");
       }
-
-      if (product.getOriPrice() == null) {
-        throw new InputErrorException("第" + orderNo + "行商品参考销售价不能为空！");
-      }
-
-      if (product.getTaxPrice() == null) {
-        throw new InputErrorException("第" + orderNo + "行商品价格不能为空！");
-      }
-
-      if (product.getTaxPrice().doubleValue() < 0D) {
-        throw new InputErrorException("第" + orderNo + "行商品价格不允许小于0！");
-      }
-
-      if (!NumberUtil.equal(product.getOriPrice(), 0D)) {
-        // 由 根据原价和折扣率校验现价 更改为 根据原价、现价计算折扣率，即：不以传入的折扣率为准
-        BigDecimal discountRate = NumberUtil.getNumber(
-            NumberUtil.mul(NumberUtil.div(product.getTaxPrice(), product.getOriPrice()), 100), 2);
-        product.setDiscountRate(discountRate);
-      } else {
-        //如果原价为0，折扣率固定为100
-        product.setDiscountRate(BigDecimal.valueOf(100));
-      }
+//
+//      if (product.getOriPrice() == null) {
+//        throw new InputErrorException("第" + orderNo + "行商品参考销售价不能为空！");
+//      }
+//
+//      if (product.getTaxPrice() == null) {
+//        throw new InputErrorException("第" + orderNo + "行商品价格不能为空！");
+//      }
+//
+//      if (product.getTaxPrice().doubleValue() < 0D) {
+//        throw new InputErrorException("第" + orderNo + "行商品价格不允许小于0！");
+//      }
+
+//      if (!NumberUtil.equal(product.getOriPrice(), 0D)) {
+//        // 由 根据原价和折扣率校验现价 更改为 根据原价、现价计算折扣率，即：不以传入的折扣率为准
+//        BigDecimal discountRate = NumberUtil.getNumber(
+//            NumberUtil.mul(NumberUtil.div(product.getTaxPrice(), product.getOriPrice()), 100), 2);
+//        product.setDiscountRate(discountRate);
+//      } else {
+//        //如果原价为0，折扣率固定为100
+//        product.setDiscountRate(BigDecimal.valueOf(100));
+//      }
 
       orderNo++;
     }
 
-    BigDecimal totalAmount = this.products.stream()
-        .map(t -> NumberUtil.mul(t.getOrderNum(), t.getTaxPrice())).reduce(NumberUtil::add)
-        .orElse(BigDecimal.ZERO);
-    BigDecimal payTypeAmount = CollectionUtil.isEmpty(this.payTypes) ? BigDecimal.ZERO
-        : this.payTypes.stream().map(OrderPayTypeVo::getPayAmount).reduce(NumberUtil::add)
-            .orElse(BigDecimal.ZERO);
-    if (!NumberUtil.equal(totalAmount, payTypeAmount)) {
-      throw new InputErrorException("所有支付方式的支付金额不等于含税总金额，请检查！");
-    }
+//    BigDecimal totalAmount = this.products.stream()
+//        .map(t -> NumberUtil.mul(t.getOrderNum(), t.getTaxPrice())).reduce(NumberUtil::add)
+//        .orElse(BigDecimal.ZERO);
+//    BigDecimal payTypeAmount = CollectionUtil.isEmpty(this.payTypes) ? BigDecimal.ZERO
+//        : this.payTypes.stream().map(OrderPayTypeVo::getPayAmount).reduce(NumberUtil::add)
+//            .orElse(BigDecimal.ZERO);
+//    if (!NumberUtil.equal(totalAmount, payTypeAmount)) {
+//      throw new InputErrorException("所有支付方式的支付金额不等于含税总金额，请检查！");
+//    }
   }
 }