Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java

@@ -63,7 +63,6 @@ public class SmsSalesBillRest {
 		return smsSalesBillService.listPage(pq);
 	}
 
-
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody SmsSalesBillDto dto){
@@ -82,4 +81,40 @@ public class SmsSalesBillRest {
     public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return smsSalesBillService.fetchDetailsVoBySid(sid);
 	}
+
+	@ApiOperation("销售订单审核列表")
+	@PostMapping("/reviewListPage")
+	public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(@RequestBody PagerQuery<OrderReviewQuery> pq){
+		return smsSalesBillService.reviewListPage(pq);
+	}
+
+	@ApiOperation("销售订单审核详情")
+	@GetMapping("/reviewDetails")
+	public ResultBean<ReviewDetailsVo> reviewDetails(@RequestParam("sid") String sid){
+		return smsSalesBillService.reviewDetails(sid);
+	}
+
+	@ApiOperation("收货地址保存")
+	@PostMapping("/saveShipper")
+	public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto){
+		return smsSalesBillService.saveShipper(dto);
+	}
+
+	@ApiOperation("发票信息保存")
+	@PostMapping("/saveInvoice")
+	public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto){
+		return smsSalesBillService.saveInvoice(dto);
+	}
+
+	@ApiOperation("分页列表单条保存")
+	@PostMapping("/saveOneListData")
+	public ResultBean saveOneListData(@RequestBody OrderReviewVo dto){
+		return smsSalesBillService.saveOneListData(dto);
+	}
+
+	@ApiOperation("审核确认")
+	@PostMapping("/reviewConfirm")
+	public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto){
+		return smsSalesBillService.reviewConfirm(dto);
+	}
 }

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewQuery.java

@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 11:42
+ */
+@Data
+public class OrderReviewQuery implements Query {
+
+    private String createOrgSid;
+    @ApiModelProperty("单据类型key（线下订单/预售订单等）")
+    private String billTypeKey;
+    @ApiModelProperty("店铺")
+    private String shopName;
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("订单号")
+    private String billNo;
+    @ApiModelProperty("快递单号")
+    private String logisticsNum;
+    @ApiModelProperty("买家ID")
+    private String buyserID;
+    @ApiModelProperty("快递")
+    private String logisticsName;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewVo.java

@@ -0,0 +1,100 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 11:19
+ */
+@Data
+public class OrderReviewVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("订单标记（已开票、仓库打回等）")
+    private String billState; // 订单标记（已开票、仓库打回等）
+    @ApiModelProperty("提醒（拆、合、缺）")
+    private String noticeState; // 订单标记（已开票、仓库打回等）
+    @ApiModelProperty("剩余发货时间")
+    private String remainderTime; // 剩余发货时间
+    @ApiModelProperty("商品总数")
+    private String goodsTotalCount; // 商品总数
+    @ApiModelProperty("线上商品图片")
+    private List<String> picOnline = new ArrayList<>();
+    @ApiModelProperty("系统商品图片")
+    private List<String> picSys = new ArrayList<>();
+    @ApiModelProperty("线上备注/系统备注")
+    private String remarksOnlineSys; // 线上备注/系统备注
+    @ApiModelProperty("买家留言/附加信息")
+    private String buyerMessage; // 买家留言/附加信息
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("配送方式Value")
+    private String deliveryTypeValue;
+    @ApiModelProperty("快递")
+    private String logisticsName;
+    @ApiModelProperty("快递成本/干线费用")
+    private String logisticsCost;
+    @ApiModelProperty("买家ID")
+    private String buyserID;
+    @ApiModelProperty("收货地址")
+    private String deliveryAddress;
+    @ApiModelProperty("买家实付")
+    private String realPay;
+    @ApiModelProperty("优惠")
+    private String discountAmount;
+    @ApiModelProperty("应收")
+    private String dueAmount;
+    @ApiModelProperty("运费")
+    private String freight;
+    @ApiModelProperty("服务费")
+    private String serviceAmount;
+    @ApiModelProperty("声明价值（保价）")
+    private String declaredValue;
+    @ApiModelProperty("重量(Kg)")
+    private String weight;
+    @ApiModelProperty("体积(m³)")
+    private String volume;
+    @ApiModelProperty("订单号")
+    private String billNo;
+    @ApiModelProperty("系统单号")
+    private String sysBillNo;
+    @ApiModelProperty("店铺")
+    private String shopName;
+    @ApiModelProperty("下单时间（距今）")
+    private String billCreateTime;
+    @ApiModelProperty("付款时间（距今）")
+    private String payTime;
+    @ApiModelProperty("预计发货时间")
+    private String expectSendDate;
+    @ApiModelProperty("预计送达时间")
+    private String deliveryDate;
+    @ApiModelProperty("承诺/最晚揽收时间")
+    private String latestReceivingTime;
+    @ApiModelProperty("承诺/最晚发货时间")
+    private String latestSendTime;
+    @ApiModelProperty("承诺/最晚送达时间")
+    private String latestArriveTime;
+    @ApiModelProperty("应推时间")
+    private String needPushTime;
+    @ApiModelProperty("业务员")
+    private String salesName;
+    @ApiModelProperty("开票名称(发票抬头)")
+    private String invoiceTitle;
+    @ApiModelProperty("达人ID")
+    private String talentID;
+    @ApiModelProperty("达人昵称")
+    private String buyserNickname;
+    @ApiModelProperty("代发店铺")
+    private String agentShop;
+    @ApiModelProperty("原始平台")
+    private String originalPlat;
+    @ApiModelProperty("原始单号")
+    private String originalBillNo;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewConfirmDto.java

@@ -0,0 +1,20 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 16:57
+ */
+@Data
+public class ReviewConfirmDto {
+    private String type; //0通过 1不通过
+    private String remarks; //意见
+    private List<String> sids;
+    private String createBySid; //登录人sid
+    private String createByName; //登录人
+}
+

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java

@@ -0,0 +1,22 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 14:50
+ */
+@Data
+public class ReviewDetailsVo {
+
+    private String sid;
+    private List<ReviewGoods> goods; //商品信息
+    private ReviewShipper shipper = new ReviewShipper(); //收货地址
+    private ReviewRemarksInfo remarksInfo = new ReviewRemarksInfo(); //备注信息
+    private ReviewInvoice invoice = new ReviewInvoice(); //发票信息
+    private List<ReviewDiscount> discounts; //优惠详情
+    private List<ReviewRecord> records; //操作记录
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDiscount.java

@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 15:34
+ */
+@Data
+public class ReviewDiscount {
+
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+    @ApiModelProperty("商品简称")
+    private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode; // 商品编码
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+
+    @ApiModelProperty("优惠名称")
+    private String discountName; // 优惠名称
+    @ApiModelProperty("优惠金额")
+    private String discountAmount; // 优惠金额
+    @ApiModelProperty("平台商品名称")
+    private String platGoodsName; // 平台商品名称
+    @ApiModelProperty("平台规格名称")
+    private String platOwnSpec; // 平台规格名称
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java

@@ -0,0 +1,73 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 14:53
+ */
+@Data
+public class ReviewGoods {
+
+
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+    @ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode; // 商品编码
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("条码")
+    private String barCode; // 条码
+    @ApiModelProperty("销售单价")
+    private String price; // 销售单价
+    @ApiModelProperty("折后单价")
+    private String discountPrice; // 折后单价
+    @ApiModelProperty("数量")
+    private String count; // 数量
+    @ApiModelProperty("应收款")
+    private String dueAmount; // 应收款
+    @ApiModelProperty("销售金额")
+    private String amount; // 销售金额
+    @ApiModelProperty("税率")
+    private String taxRate; // 库存数量
+    @ApiModelProperty("税额")
+    private String taxAmount; // 税额
+    @ApiModelProperty("参考进价")
+    private String referenceCost; // 参考进价
+    @ApiModelProperty("商品成本")
+    private String cost; // 商品成本
+    @ApiModelProperty("批次号")
+    private String batchNumber; // 批次号
+    @ApiModelProperty("实际库存")
+    private String inventoryCount; // 库存数量
+    @ApiModelProperty("可分配库存")
+    private String allocateCount; // 可分配库存
+    @ApiModelProperty("可用库存")
+    private String useCount; // 可用库存
+    @ApiModelProperty("在途库存")
+    private String wayCount; // 在途库存
+    @ApiModelProperty("各仓库存")
+    private String wareHouseCount; // 各仓库存
+    @ApiModelProperty("库存状况")
+    private String inventoryState; // 库存状况
+    @ApiModelProperty("单号")
+    private String billNo; // 单号
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("图片")
+    private String goodsImgUrl; // 图片
+    @ApiModelProperty("预计发货时间")
+    private String expectSendDate; // 预计发货时间
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewInvoice.java

@@ -0,0 +1,53 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 15:28
+ */
+@Data
+public class ReviewInvoice {
+
+    @ApiModelProperty("开票形式（001纸质发票/002电子发票")
+    private String invoiceMediumKey; // 开票形式（001纸质发票/002电子发票
+    @ApiModelProperty("开票形式（纸质发票/电子发票）")
+    private String invoiceMediumValue; // 开票形式（纸质发票/电子发票）
+    @ApiModelProperty("发票类型Key")
+    private String invoiceTypeKey; // 发票类型Key
+    @ApiModelProperty("发票类型")
+    private String invoiceType; // 发票类型
+    @ApiModelProperty("抬头")
+    private String invoiceTitle; // 开票名称
+    @ApiModelProperty("内容")
+    private String invoiceContent; // 内容
+    @ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+    @ApiModelProperty("开户银行")
+    private String bankName; // 开户银行
+    @ApiModelProperty("银行账户")
+    private String bankAccount; // 银行账户
+    @ApiModelProperty("详细地址")
+    private String address; // 详细地址
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+    @ApiModelProperty("邮箱")
+    private String e_mail; // 邮箱
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+
+
+    @ApiModelProperty("应收合计")
+    private String dueAmount; // 应收合计
+    @ApiModelProperty("本次欠款")
+    private String thisDebt; // 本次欠款
+    @ApiModelProperty("历史欠款")
+    private String historyDebt; // 历史欠款
+    @ApiModelProperty("预收合计")
+    private String advanceBalance; // 预收款余额
+
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRecord.java

@@ -0,0 +1,16 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 15:37
+ */
+@Data
+public class ReviewRecord {
+    private String createTime;//创建时间
+    private String createByName;//账号名称
+    private String remark;//操作内容
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRemarksInfo.java

@@ -0,0 +1,17 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 15:26
+ */
+@Data
+public class ReviewRemarksInfo {
+
+    private String buyerMessage; //买家留言
+    private String remarks; //线上备注
+    private String remarksSys; //系统备注
+
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewShipper.java

@@ -0,0 +1,32 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/25 15:23
+ */
+@Data
+public class ReviewShipper {
+
+    @ApiModelProperty("收货人姓名")
+    private String shipperName; // 收货人姓名
+    @ApiModelProperty("收货人手机")
+    private String shipperMob; // 收货人手机
+    @ApiModelProperty("收货省")
+    private String deliveryProvince; // 收货省
+    @ApiModelProperty("收货市")
+    private String deliveryCity; // 收货市
+    @ApiModelProperty("收货县区")
+    private String deliveryCounty; // 收货县区
+    @ApiModelProperty("收货详细地址")
+    private String deliveryAddress; // 收货详细地址
+    @ApiModelProperty("真实姓名")
+    private String name; // 真实姓名
+    @ApiModelProperty("身份证号码")
+    private String idNo; // 身份证号码
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

@@ -40,6 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: ss-sales(ss-sales) <br/>
@@ -107,4 +109,28 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     public ResultBean deleteBySids(String[] sids) {
         return smsSalesBillFeign.delBySids(sids);
     }
+
+    public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(PagerQuery<OrderReviewQuery> pq) {
+        return smsSalesBillFeign.reviewListPage(pq);
+    }
+
+    public ResultBean<ReviewDetailsVo> reviewDetails(String sid) {
+        return smsSalesBillFeign.reviewDetails(sid);
+    }
+
+    public ResultBean saveShipper(ReviewDetailsVo dto) {
+        return smsSalesBillFeign.saveShipper(dto);
+    }
+
+    public ResultBean saveInvoice(ReviewDetailsVo dto) {
+        return smsSalesBillFeign.saveInvoice(dto);
+    }
+
+    public ResultBean saveOneListData(OrderReviewVo dto) {
+        return smsSalesBillFeign.saveOneListData(dto);
+    }
+
+    public ResultBean reviewConfirm(ReviewConfirmDto dto) {
+        return smsSalesBillFeign.reviewConfirm(dto);
+    }
 }

oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java

@@ -3,10 +3,7 @@ package com.yxt.oms.feign.sales.smssalesbill;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo;
+import com.yxt.oms.biz.func.smssalesbill.*;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -40,5 +37,27 @@ public interface SmsSalesBillFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("销售订单审核列表")
+    @PostMapping("/reviewListPage")
+    public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(@RequestBody PagerQuery<OrderReviewQuery> pq);
 
+    @ApiOperation("销售订单审核详情")
+    @GetMapping("/reviewDetails")
+    public ResultBean<ReviewDetailsVo> reviewDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("收货地址保存")
+    @PostMapping("/saveShipper")
+    public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto);
+
+    @ApiOperation("发票信息保存")
+    @PostMapping("/saveInvoice")
+    public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto);
+
+    @ApiOperation("分页列表保存")
+    @PostMapping("/saveOneListData")
+    public ResultBean saveOneListData(@RequestBody OrderReviewVo dto);
+
+    @ApiOperation("审核确认")
+    @PostMapping("/reviewConfirm")
+    public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto);
 }

oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java

@@ -3,10 +3,7 @@ package com.yxt.oms.feign.sales.smssalesbill;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo;
+import com.yxt.oms.biz.func.smssalesbill.*;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery;
-import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -36,4 +33,34 @@ public class SmsSalesBillFeignFallback implements SmsSalesBillFeign {
     public ResultBean<SmsSalesBillDetailsVo> fetchDetailsBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<OrderReviewVo>> reviewListPage(PagerQuery<OrderReviewQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReviewDetailsVo> reviewDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveShipper(ReviewDetailsVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveInvoice(ReviewDetailsVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOneListData(OrderReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reviewConfirm(ReviewConfirmDto dto) {
+        return null;
+    }
 }