修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java

@@ -15,7 +15,7 @@ public class VehicleStateTempOrLast {
 
         ARREARS_INVOICING("0004", "欠款开票"),
 
-        PAY_MODELS("0002", "交清车款"),
+        PAY_MODELS("0002", "正常交款"),
 
         BAG_CARD_BUSINESS("0003", "包牌业务"),
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java

@@ -52,8 +52,11 @@ public class BusDeliveredVo implements Vo {
     private static final long serialVersionUID = -9212919952192716940L;
     private String sid;
 
-    @ApiModelProperty("类型：1已交款、2未交款")
+//    @ApiModelProperty("类型：1已交款、2未交款")
+    @ApiModelProperty("业务状态")
     private String type;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java

@@ -70,4 +70,9 @@ public interface BusSalesOrderDiscountFeign {
     @PostMapping("/delete")
     @ResponseBody
     ResultBean delete(@RequestParam(value = "saleOrderSid") String orderSid, @RequestParam(value = "sid") String sid);
+
+    @ApiOperation("出库选择套餐列表")
+    @GetMapping("/discountList")
+    @ResponseBody
+    ResultBean<List<OrderDiscountVo>> discountList(@RequestParam("contractNo") String contractNo,@RequestParam("vinSid")String vinSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java

@@ -64,4 +64,9 @@ public class BusSalesOrderDiscountFeignFallback implements BusSalesOrderDiscount
     public ResultBean delete(String orderSid, String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<OrderDiscountVo>> discountList(String contractNo,String vinSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.bussalesorderdiscount;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/6 16:50
+ * @Description
+ */
+@Data
+public class OrderDiscountVo {
+
+    @ApiModelProperty("优惠名称")
+    private String name;
+    @ApiModelProperty("价值")
+    private String price;
+    @ApiModelProperty("优惠项目说明")
+    private String discountExplain;
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("剩余数量")
+    private Integer surplusNum;
+    @ApiModelProperty("本次赠送数量")
+    private Integer giveNum;
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -109,4 +110,6 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDis
      * @return
      */
     List<AppOrderDiscountListVo> selectDiscount(String sid);
+
+    List<OrderDiscountVo> discountList(String contractNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -55,4 +55,8 @@
         from bus_sales_order_discount
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="discountList" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo">
+        select * from bus_sales_order_discount
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderdiscount;
 
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import com.yxt.common.core.result.ResultBean;
@@ -71,4 +72,9 @@ public class BusSalesOrderDiscountRest implements BusSalesOrderDiscountFeign {
     public ResultBean delete(String orderSid, String sid) {
         return busSalesOrderDiscountService.deleteDiscount(orderSid, sid);
     }
+
+    @Override
+    public ResultBean<List<OrderDiscountVo>> discountList(String contractNo, String vinSid) {
+        return busSalesOrderDiscountService.discountList(contractNo, vinSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListV
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppDiscountInfoDto;
@@ -140,7 +141,7 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
             int numAll = busSalesOrderDiscount1.getNum() + Integer.parseInt(appDiscountInfoDto.getNum());
             BigDecimal bigDecimal = new BigDecimal(appDiscountInfoDto.getPrice());
             bigDecimal = bigDecimal.multiply(new BigDecimal(String.valueOf(numAll)));
-            baseMapper.updateNum(salesOrderSid, salesPolicySid, numAll,bigDecimal.toString());
+            baseMapper.updateNum(salesOrderSid, salesPolicySid, numAll, bigDecimal.toString());
         }
 
         return rb.success().setMsg("成功");
@@ -172,4 +173,11 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
     public List<AppOrderDiscountListVo> selectDiscount(String sid) {
         return baseMapper.selectDiscount(sid);
     }
+
+    public ResultBean<List<OrderDiscountVo>> discountList(String contractNo,String vinSid) {
+        ResultBean<List<OrderDiscountVo>> rb = ResultBean.fireFail();
+        //查询出库的选择套餐中是否存在
+        List<OrderDiscountVo> list = baseMapper.discountList(contractNo);
+        return rb.success().setData(list);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java

@@ -125,8 +125,11 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
 
     /**
      * 根据客户编码查询客户信息
+     *
      * @param customerNo 客户编码
      * @return
      */
     CrmCustomerTemp selectByCustomerNo(String customerNo);
+
+    List<CrmCustomerTemp> selectLists(@Param(Constants.WRAPPER) QueryWrapper<CrmCustomerTemp> qw);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -20,8 +20,8 @@
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
-        SELECT *
-        FROM crm_customer_temp
+        SELECT cct.*
+        FROM crm_customer_temp cct
         <where>
             ${ew.sqlSegment}
         </where>
@@ -224,4 +224,11 @@
     <select id="selectByCustomerNo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
         select * from crm_customer_temp where customerNo = #{customerNo}
     </select>
+
+    <select id="selectLists" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
+        select cct.* from crm_customer_temp cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -125,7 +125,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
 
     public List<CrmCustomerTemp> listAll(CrmCustomerTempQuery query) {
         QueryWrapper<CrmCustomerTemp> qw = createQueryWrapper(query);
-        return baseMapper.selectList(qw);
+        return baseMapper.selectLists(qw);
     }
 
     private QueryWrapper<CrmCustomerTemp> createQueryWrapper(CrmCustomerTempQuery query) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java

@@ -10,4 +10,6 @@ public class VinListVo implements Vo {
 
     @ApiModelProperty("车架号")
     private String vin;
+    @ApiModelProperty("业务状态")
+    private String businessState;
 }

doc/databases/bus-center_tables.sql

@@ -264,9 +264,9 @@ CREATE TABLE `bus_delivered_details_discount`
     `name`            varchar(64)          DEFAULT NULL COMMENT '优惠包名称',
     `price`           varchar(64)          DEFAULT NULL COMMENT '价值',
     `discountExplain` VARCHAR(64)          DEFAULT NULL COMMENT '优惠包项目说明',
-    `num`             VARCHAR(64)          DEFAULT NULL COMMENT '数量',
-    `surplusNum`      VARCHAR(64)          DEFAULT NULL COMMENT '剩余数量',
-    `useMessageSid`   VARCHAR(64)          DEFAULT NULL COMMENT '本次赠送数量',
+    `num`             int(32)              DEFAULT NULL COMMENT '数量',
+    `surplusNum`      int(32)              DEFAULT NULL COMMENT '剩余数量',
+    `giveNum`         int(32)              DEFAULT NULL COMMENT '本次赠送数量',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB