Merge remote-tracking branch 'origin/master'

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

@@ -52,8 +52,15 @@ public class BusDeliveredDto implements Dto {
     private static final long serialVersionUID = -6078868417258339533L;
     private String sid;
 
-    @ApiModelProperty("类型：1车款交清、2欠款提车")
+   /* @ApiModelProperty("类型：1车款交清、2欠款提车")
-    private Integer type;
+    private Integer type;*/
+   @ApiModelProperty("款项类型")
+   private String subscription;
+    private String subscriptionKey;
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    private String paymentMethod;
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    private String paymentMethodKey;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -238,4 +238,9 @@ public interface BusSalesOrderFeign {
     @GetMapping("/selectByContractNo")
     @ResponseBody
     ResultBean<BusSalesOrderPrice> selectByContractNo(@RequestParam("contractNo")String contractNo);
+
+    @ApiOperation("查询该合同下的销售订单")
+    @GetMapping("/selectOrderByContractNo")
+    @ResponseBody
+    ResultBean<BusSalesOrder> selectOrderByContractNo(@RequestParam("contractNo")String contractNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -214,4 +214,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrderPrice> selectByContractNo(String contractNo) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusSalesOrder> selectOrderByContractNo(String contractNo) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -183,4 +183,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     BusSalesOrderDetailsVo getByContractNo(String contractNo);
 
     String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo);
+
+    BusSalesOrder selectOrderByContractNo(String contractNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -277,4 +277,8 @@
         where bo.contractNo = #{contractNo}
           and bv.linkNo = #{vinNo}
     </select>
+
+    <select id="selectOrderByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from bus_sales_order where contractNo = #{contractNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -291,4 +291,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrderPrice> selectByContractNo(String contractNo) {
         return busSalesOrderService.selectByContractNoOne(contractNo);
     }
+
+    @Override
+    public ResultBean<BusSalesOrder> selectOrderByContractNo(String contractNo) {
+        return busSalesOrderService.selectOrderByContractNo(contractNo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2913,4 +2913,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success().setData(busSalesOrderPrice);
     }
+
+    public ResultBean<BusSalesOrder> selectOrderByContractNo(String contractNo) {
+        ResultBean<BusSalesOrder> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
+        if(busSalesOrder == null){
+            return rb;
+        }
+        return rb.success().setData(busSalesOrder);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -39,7 +39,12 @@ import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
+import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
@@ -113,6 +118,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private BusDeliveredFeign busDeliveredFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1153,10 +1160,32 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     BusSalesOrderPrice busSalesOrderPrice = resultBean.getData();
                     BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice();
                     if(singleFinalPrice.compareTo(bigDecimalVinAll) == 0){//推送待出库
+                        BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
+                        busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
+                        busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks());
+                        ResultBean<BusSalesOrder> busSalesOrderResultBean = busSalesOrderFeign.selectOrderByContractNo(v.getContractNo());
+                        if(busSalesOrderResultBean.getSuccess()){
+                            BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData();
+                            if(busSalesOrder != null){
+                                busDeliveredDto.setPaymentMethodKey(busSalesOrder.getPayTypeKey());
+                                busDeliveredDto.setPaymentMethod(busSalesOrder.getPayType());
+                            }
+                        }
+                        busDeliveredDto.setContractNo(v.getContractNo());
+                        busDeliveredDto.setName(v.getCustomerName());
+                        busDeliveredDto.setVinNo(v.getVIN());
+                        busDeliveredDto.setMobile(v.getCustomerPhone());
+                        busDeliveredDto.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                        //根据客户sid查询客户的身份证号和
+                        ResultBean<AppOrderDetailsVo> orderDetails = busSalesOrderFeign.getSaleOrderDetails(busSalesOrderPrice.getSalesOrderSid());
+                        AppOrderDetailsVo vo = orderDetails.getData();
+                        if(vo != null){
+                            AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
+                            busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());
+                        }
+                        ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
 
                     }
-
-
                 }
             });
             //查询该申请已认款金额总数

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -111,18 +111,20 @@
         </where>
     </select>
     <select id="selectByUserName" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
-        SELECT *
+        SELECT su.*
-        FROM sys_user
+        FROM sys_user su
-        where userName = #{param1}
+        left join sys_staffinfo si on si.sid = su.staffSid
-          and isDelete = 0
+        where su.userName = #{param1}
-          and userType = 1
+          and su.isDelete = 0
+          and su.userType = 1 and si.personTypeKey != '01'
     </select>
     <select id="selectByUserNameApp" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
-        SELECT *
+        SELECT su.*
-        FROM sys_user
+        FROM sys_user su
-        where userName = #{param1}
+        left join sys_staffinfo si on si.sid = su.staffSid
-          and isDelete = 0
+        where su.userName = #{param1}
-          and userType = 1
+          and su.isDelete = 0
+          and su.userType = 1
     </select>
     <select id="selectByAppId" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT *
@@ -240,11 +242,12 @@
     </update>
 
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
-        select *
+        select su.*
-        from sys_user
+        from sys_user su
-        where mobile = #{mobile}
+        left join sys_staffinfo si on si.sid = su.staffSid
-          and isDelete = 0
+        where su.mobile = #{mobile}
-          and userType = 1
+          and su.isDelete = 0
+          and su.userType = 1 and si.personTypeKey != '01'
     </select>
 
     <update id="updateIsEnable">