小程序销售订单列表按照最新需求调整查询当前客户下已办结销售订单完成

小程序销售订单列表增加经销商返回字段完成
创建客户时自动创建客户账号
客户基础信息返回基础信息是否完善和身份证信息是否完善返回字段完成

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

@@ -403,4 +403,11 @@ public interface BusSalesOrderFeign {
     @PostMapping("/saveList")
     @ResponseBody
     void saveList(@RequestBody() List<BusSalesOrder> orders);
+
+    /**********************************************小程序订单列表********************************************************/
+
+    @ApiOperation("小程序销售订单分页列表")
+    @PostMapping("/getSaleOrdersWx")
+    @ResponseBody
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersWx(@RequestBody PagerQuery<AppBusSalesOrderQuery> pq);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java

@@ -63,7 +63,4 @@ public class AppBusSalesOrderQuery implements Query {
     private String staffSid;
     @ApiModelProperty("当前组织机构全路径sid")
     private String orgPath;
-
-
-
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -53,6 +53,9 @@ import lombok.Data;
 public class AppBusSalesOrderVo implements Vo {
 
     private static final long serialVersionUID = -5570433499942792774L;
+
+    @ApiModelProperty("经销商")
+    private String dealer;
     /**
      * 销售订单sid
      */

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

@@ -456,4 +456,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public void saveList(List<BusSalesOrder> orders) {
          busSalesOrderService.saveList(orders);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersWx(PagerQuery<AppBusSalesOrderQuery> pq) {
+        ResultBean<PagerVo<AppBusSalesOrderVo>> rb = ResultBean.fireFail();
+        PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrdersWx(pq);
+        return rb.success().setData(pv);
+    }
 }

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

@@ -2150,6 +2150,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return qw;
     }
 
+    /**
+     * 构造查询条件
+     *
+     * @param query 查询条件
+     * @return
+     */
+    private QueryWrapper<BusSalesOrder> appCreateQueryWrapperWx(AppBusSalesOrderQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData();
+                qw.eq("bo.customerSid", crmCustomerTempVo.getSid());
+            }
+            qw.eq("bo.nodeState", "已办结");
+        }
+        return qw;
+    }
+
     /**
      * App销售订单分页列表
      *
@@ -8274,4 +8294,61 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public void saveList(List<BusSalesOrder> orders) {
         baseMapper.saveList(orders);
     }
+
+    public PagerVo<AppBusSalesOrderVo> getSaleOrdersWx(PagerQuery<AppBusSalesOrderQuery> pq) {
+        QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapperWx(pq.getParams());
+        IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
+        IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
+        for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            record.setShowFinancialBtn(false);
+            record.setShowStopBtn(false);
+            record.setShowContractBtn(false);
+            record.setShowBorrowBtn(false);
+            record.setShowInputBtn(false);
+            record.setShowApplyBtn(false);
+            if (StringUtils.isBlank(record.getClosingDate())) {
+                record.setClosingDate("-");
+            }
+            if (StringUtils.isNotBlank(record.getCustomerImage())) {
+                record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
+            }
+            //已交定金
+            String deposit = "-";
+            BigDecimal depositBig = new BigDecimal("0");
+            if (StringUtils.isNotBlank(record.getDepositAll())) {
+                //需补交订金
+                if (StringUtils.isNotBlank(record.getMakeUpDeposit())) {
+                    depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit()));
+                } else {
+                    depositBig = new BigDecimal(record.getDepositAll());
+                }
+                //将已交订金转为string
+                deposit = depositBig.toString();
+            }
+            record.setDeposit(deposit);
+            //查询车型信息
+            AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid());
+            if (appModelInfo != null) {
+                if (StringUtils.isBlank(appModelInfo.getPrice())) {
+                    appModelInfo.setPrice("-");
+                }
+                //根据车型查询车型图片
+                ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid());
+                if (imageString.getSuccess()) {
+                    appModelInfo.setCarImage(imageString.getData().toString());
+                }
+                record.setModelInfo(appModelInfo);
+            }
+            //是否保险
+            String insuranceInfo = record.getInsuranceInfo();
+            if (StringUtils.isBlank(insuranceInfo)) {
+                record.setInsuranceInfo("-");
+            }
+            if (StringUtils.isBlank(record.getSaleOrderState())) {
+                record.setSaleOrderState("待提交");
+            }
+        }
+        PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

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

@@ -43,10 +43,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
-import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.*;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -935,6 +932,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
             commonAppendixFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList);
         }
+        //创建客户账号中
+        SysUserDto sysUserDto = new SysUserDto();
+        sysUserDto.setMobile(dto.getMobile());
+        sysUserDto.setUserType(2);
+        sysUserFeign.saveCustUser(sysUserDto);
         return crmCustomerTemp;
 
     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -56,6 +56,10 @@ public interface SysUserFeign {
     @PostMapping("/save")
     public ResultBean save(@Valid @RequestBody SysUserDto dto);
 
+    @ApiOperation("新增保存客户账号")
+    @PostMapping("/saveCustUser")
+    public ResultBean saveCustUser(@Valid @RequestBody SysUserDto dto);
+
     @ApiOperation("根据staffSid删除用户（逻辑删除）")
     @PostMapping("/delSysUserByMobile")
     public ResultBean delSysUserByMobile(@RequestParam("sid") String sid);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -50,6 +50,11 @@ public class SysUserFeignFallback implements SysUserFeign {
 		return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/save无法访问");
 	}
 
+	@Override
+	public ResultBean saveCustUser(SysUserDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean delSysUserByMobile(String sid) {
 		return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/delSysUserByMobile无法访问");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java

@@ -24,4 +24,9 @@ public class WxHomePageVo implements Vo {
     private Boolean isHave;
     @ApiModelProperty(value = "客户sid")
     private String staffSid;
+
+    @ApiModelProperty(value = "基础信息是否完善")
+    private Boolean base = true;
+    @ApiModelProperty(value = "身份证信息是否完善")
+    private Boolean idCard = false;
 }

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

@@ -172,6 +172,34 @@ public class SysUserRest implements SysUserFeign {
         return rb.success();
     }
 
+    @Override
+    public ResultBean saveCustUser(SysUserDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //手机号
+        String mobile = dto.getMobile();
+        //用户类型
+        int userType = dto.getUserType();
+        if (StringUtils.isBlank(mobile)) {
+            return new ResultBean<SysUserVo>().fail().setMsg("手机号不能为空");
+        } else {
+            SysUser one = sysUserService.fetchByUserName(mobile);
+            if (null != one) {
+                return new ResultBean<SysUserVo>().fail().setMsg("手机号重复!`");
+            }
+        }
+        if (userType == 0) {
+            return new ResultBean<SysUserVo>().fail().setMsg("用户类型不能为空");
+        }
+        String password = mobile.substring(5, 11);
+        String md5 = Encodes.md5(password);
+        SysUser su = new SysUser();
+        dto.fillEntity(su);
+        su.setUserName(mobile);
+        su.setPassword(md5);
+        sysUserService.save(su);
+        return rb.success();
+    }
+
     @Override
     public ResultBean delSysUserByMobile(String mobile) {
         int i = sysUserService.delSysUserByMobile(mobile);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -81,6 +81,13 @@ import java.util.List;
         fallback = AppBusSalesOrderFeignFallback.class)
 public interface AppBusSalesOrderFeign {
 
+    /*-------------------------------------小程序销售订单接口----------------------------------------------*/
+
+    @ApiOperation("小程序销售订单分页列表")
+    @PostMapping("/getSaleOrdersWx")
+    @ResponseBody
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(@RequestBody PagerQuery<BusOrderSalesQuery> pq);
+
     /*-------------------------------------App销售订单接口------------------------------------------------*/
 
     @ApiOperation("初始化销售订单状态")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -15,6 +15,9 @@ import lombok.Data;
 public class BusOrderSalesVo implements Vo {
     private static final long serialVersionUID = 6162163732173109484L;
 
+    @ApiModelProperty("经销商")
+    private String dealer;
+
     /**
      * 销售订单sid
      */

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -83,6 +83,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     @Autowired
     AppBusSalesOrderService appBusSalesOrderService;
 
+    /************************************ 小程序订单接口 *********************************************/
+
+    @Override
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(PagerQuery<BusOrderSalesQuery> pq) {
+        return appBusSalesOrderService.getSaleOrdersWx(pq);
+    }
 
     /************************************* 销售订单接口 *********************************************/
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -1021,4 +1021,12 @@ public class AppBusSalesOrderService {
         appSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
         return rb.success().setData(appSalesOrderTrailerDetailsVo);
     }
+
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(PagerQuery<BusOrderSalesQuery> pagerQuery) {
+        ResultBean<PagerVo<BusOrderSalesVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppBusSalesOrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrdersWx(pq);
+        PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
+        return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
+    }
 }