下单流程调整

src/main/java/com/qs/serve/common/util/CodeGenUtil.java

@@ -24,6 +24,7 @@ public class CodeGenUtil {
         CostApply("cost_apply"),
         SalePlan("SalePlan"),
         Activity("activity"),
+        OmsOrder("OmsOrder"),
         Verification("verification"),
         Policy("policy"),
         Budget("Budget"),

src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.modules.exl.common.ExlConst;
 import com.qs.serve.modules.exl.entity.ExlColumnConf;
+import com.qs.serve.modules.exl.entity.bo.ExlTableUserBo;
 import com.qs.serve.modules.exl.entity.dto.ExlTableBo;
 import com.qs.serve.modules.exl.service.ExlColumnConfService;
 import com.qs.serve.modules.exl.service.ExlTableUserService;
@@ -49,6 +50,11 @@ public class ExlTableConfServiceImpl extends ServiceImpl<ExlTableConfMapper,ExlT
                 a.setId(null);
             });
             columnConfService.saveBatch(columnList);
+            ExlTableUserBo tableUserBo = param.getAdminParam();
+            if(tableUserBo!=null){
+                tableUserBo.setTableConfId(tableConf.getId());
+                tableUserService.confAdmins(tableUserBo);
+            }
             return tableConf;
         }else {
             //update
@@ -79,8 +85,10 @@ public class ExlTableConfServiceImpl extends ServiceImpl<ExlTableConfMapper,ExlT
             });
             columnConfService.saveBatch(columnList);
         }
-        if(param.getAdminParam()!=null){
-            tableUserService.confAdmins(param.getAdminParam());
+        ExlTableUserBo tableUserBo = param.getAdminParam();
+        if(tableUserBo!=null){
+            tableUserBo.setTableConfId(tableConf.getId());
+            tableUserService.confAdmins(tableUserBo);
         }
         return tableConf;
     }

src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableUserServiceImpl.java

@@ -41,6 +41,7 @@ public class ExlTableUserServiceImpl extends ServiceImpl<ExlTableUserMapper,ExlT
                 tableUser.setUserId(sysUser.getId());
                 tableUser.setUserCode(sysUser.getCode());
                 tableUser.setUserName(sysUser.getName());
+                list.add(tableUser);
             }
             super.saveBatch(list);
         }

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderItemController.java

@@ -37,7 +37,6 @@ public class OmsOrderItemController {
      * @return
      */
     @GetMapping("/listByOrderId/{orderId}")
-    @PreAuthorize("hasRole('oms:orderItem:query')")
     public R<List<OmsOrderItem>> listByOrderId(@PathVariable("orderId")Long orderId){
         LambdaQueryWrapper<OmsOrderItem> lqw = new LambdaQueryWrapper<>();
         lqw.eq(OmsOrderItem::getOrderId,orderId);
@@ -52,7 +51,6 @@ public class OmsOrderItemController {
      */
     @GetMapping("/getById/{id}")
     @SysLog(module = SystemModule.BASE, title = "订单明细", biz = BizType.QUERY)
-    @PreAuthorize("hasRole('oms:orderItem:query')")
     public R<OmsOrderItem> getById(@PathVariable("id") String id){
         OmsOrderItem omsOrderItem = omsOrderItemService.getById(id);
         return R.ok(omsOrderItem);

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -9,6 +9,8 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
+import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
 import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.entity.bo.OmsCancelOrder;
@@ -17,6 +19,8 @@ import com.qs.serve.modules.oms.entity.bo.OmsOrderPcBo;
 import com.qs.serve.modules.oms.entity.vo.OmsConfirmOrderResult;
 import com.qs.serve.modules.oms.service.OmsOrderItemService;
 import com.qs.serve.modules.oms.service.OmsOrderService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +41,8 @@ public class OmsOrderApi {
 
     private OmsOrderService omsOrderService;
     private OmsOrderItemService omsOrderItemService;
+    private BmsSupplierAddressService bmsSupplierAddressService;
+    private SysUserService sysUserService;
 
     /**
      * 确认订单
@@ -99,6 +105,28 @@ public class OmsOrderApi {
         return R.byPageHelperList(list);
     }
 
+    /**
+     * 翻页查询(PC,我的业务订单)
+     * @param param
+     * @return
+     */
+    @GetMapping("/page4pc")
+    public R<PageVo<OmsOrder>> getPage4Pc(OmsOrder param){
+        PageUtil.startPage();
+        LambdaQueryWrapper<OmsOrder> orderWrapper = new LambdaQueryWrapper<>(param);
+        orderWrapper.eq(OmsOrder::getUserId,AuthContextUtils.getSysUserId());
+        List<OmsOrder> list = omsOrderService.list(orderWrapper);
+        for (OmsOrder order : list) {
+            BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(order.getSupplierAddrId());
+            order.setAddressInfo(supplierAddress);
+            SysUser sysUser = sysUserService.getById(order.getCheckUserId());
+            if(sysUser!=null){
+                order.setCheckUserInfo(sysUser.toSysUserVo());
+            }
+        }
+        return R.byPageHelperList(list);
+    }
+
     /**
      * 根据ID查询
      * @param id

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -33,6 +33,7 @@ public class OmsOrder implements Serializable {
     /** 订单号 */
     @NotBlank(message = "订单号不能为空")
     @Length(max = 20,message = "订单号长度不能超过20字")
+    @TableField(exist = false)
     private String orderSn;
 
     /** 供应商ID */
@@ -145,5 +146,13 @@ public class OmsOrder implements Serializable {
     @TableField(exist = false)
     private List<?> orderItems;
 
+    /** 订单明细项 */
+    @TableField(exist = false)
+    private Object addressInfo;
+
+    /** 确认订单人员 */
+    @TableField(exist = false)
+    private Object checkUserInfo;
+
 }
 

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderPcBo.java

@@ -25,6 +25,9 @@ public class OmsOrderPcBo {
     /** 创建订单参数（确认订单时可不传） */
     private CreateOrderParam createOrderParam;
 
+    /** 收货地址 */
+    private Long addressId;
+
     @Data
     public static class SkuParam{
         /** skuId */

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -2,10 +2,7 @@ package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.util.*;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
@@ -155,7 +152,13 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
 
         //todo 计算供应商折扣
         //todo 计算是否有活动优惠
-        BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+        //收货地址
+        BmsSupplierAddress supplierAddress;
+        if(confirmOrder.getAddressId()!=null){
+            supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId());
+        }else {
+            supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+        }
         OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult();
         confirmOrderResult.setSupplier(supplier);
         confirmOrderResult.setDefaultAddress(supplierAddress);
@@ -190,7 +193,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         }
         List<OmsShoppingCart> shoppingCarts = confirmOrder.getShoppingCarts();
         OmsOrder order = new OmsOrder();
-        order.setOrderSn(StringUtils.generateOrderNo());
+        order.setOrderSn("SN"+CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
         order.setSupplierId(Long.parseLong(supplier.getId()));
         order.setSupplierCode(supplier.getCode());
         order.setSupplierName(supplier.getName());

src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java

@@ -32,6 +32,14 @@ public class SalePlan implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    /** 年 */
+    @NotNull(message = "年份不能为空")
+    private Integer yearNum;
+
+    /** 月 */
+    @NotNull(message = "月份不能为空")
+    private Integer monthNum;
+
     /** 编码 */
     @NotBlank(message = "编码不能为空")
     @Length(max = 50,message = "编码长度不能超过50字")

src/main/java/com/qs/serve/modules/sale/entity/bo/SalePlanBo.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -16,6 +17,14 @@ public class SalePlanBo {
     /** id */
     private Long id;
 
+    /** 年 */
+    @NotNull(message = "年份不能为空")
+    private Integer yearNum;
+
+    /** 月 */
+    @NotNull(message = "月份不能为空")
+    private Integer monthNum;
+
     /** 标题 */
     @NotBlank(message = "标题不能为空")
     private String planTitle;

src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java

@@ -55,6 +55,8 @@ public class SalePlanServiceImpl extends ServiceImpl<SalePlanMapper,SalePlan> im
         SysUser sysUser = sysUserMapper.selectById(userId);
         BmsSupplier supplier = supplierMapper.selectById(param.getSupplierId());
         SalePlan salePlan = new SalePlan();
+        salePlan.setYearNum(param.getYearNum());
+        salePlan.setMonthNum(param.getMonthNum());
         salePlan.setPlanTitle(param.getPlanTitle());
         salePlan.setUserId(sysUser.getId());
         salePlan.setUserCode(sysUser.getCode());

src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@@ -79,6 +79,9 @@ public class VtbVerification implements Serializable {
     /** 记录释放标识 */
     private Integer regReleaseFlag;
 
+    /** 输入的释放标识 */
+    private Integer inputReleaseFlag;
+
     /** 金额 */
     private BigDecimal amount;
 

src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java

@@ -57,5 +57,8 @@ public class VtbVerificationBo implements Serializable {
     /** 原来的审批id */
     private Long orgVerificationId;
 
+    /** 是否释放 */
+    private Integer inputReleaseFlag;
+
 }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -647,6 +647,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setCostApplyId(costApply.getId());
         verification.setActivityId(verificationBo.getActivityId());
         verification.setAttachIds(verificationBo.getAttachIds());
+        verification.setInputReleaseFlag(verificationBo.getInputReleaseFlag());
         verification.setSupplierId(activity.getSupplierId());
         verification.setSupplierCode(activity.getSupplierCode());
         verification.setSupplierName(activity.getSupplierName());

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -94,6 +94,20 @@
                     #{selectId}
                 </foreach>
             </if>
+            <if test="query.selectCateIds!=null and query.selectCateIds.size > 0">
+                and `goods_spu`.`category_first` in
+                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+                or `goods_spu`.`category_second` in
+                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+                or `goods_spu`.`category_third` in
+                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
         </where>
     </select>