Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,4 +45,6 @@ public class AppCompanyShuntingListVo implements Vo {
 
     @ApiModelProperty("sid")
     private String sid;
+    @JsonProperty("CarDetailPage")
+    private AppVehicleVersionVo CarDetailPage;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppVehicleVersionVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.base.api.baseinternalpurchase;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/26 10:51
+ * @Description
+ */
+@Data
+public class AppVehicleVersionVo implements Vo {
+    private static final long serialVersionUID = -2662961586728421196L;
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.biz.baseinternalpurchase;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseinternalpurchase.*;
@@ -56,15 +57,15 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
 import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
@@ -80,10 +81,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -122,6 +120,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     private ScmVehinspectItemFeign scmVehinspectItemFeign;
     @Autowired
     private BaseVehmodelConfigService baseVehmodelConfigService;
+    @Autowired
+    private AppSubsetVersionFeign appSubsetVersionFeign;
 
     private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -314,6 +314,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
+        //=====================添加app所需参数
+        Map<String,Object> appMap = new HashMap<>();
+        appMap.put("sid",businessSid);
+        variables.put("app",appMap);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -338,6 +342,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     baseVehicleService.updateVeh(baseVehicle);
                 }
             }
+
             return voResultBean;
         }
         if (r == 2) {
@@ -712,7 +717,25 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     public ResultBean<AppCompanyShuntingVo> getCompanyShunting(String sid) {
         ResultBean<AppCompanyShuntingVo> rb = ResultBean.fireFail();
         AppCompanyShuntingVo vo = baseMapper.getCompanyShunting(sid);
+        ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
+        AppSubVersionVo appSubVersionVo = resultBean.getData();
         List<AppCompanyShuntingListVo> records = baseInternalPurchaseVehicleService.getListBySid(sid);
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            records.stream().forEach(appCompanyShuntingListVo -> {
+                AppVehicleVersionVo appVehicleVersionVo = new AppVehicleVersionVo();
+                String modelSid = appCompanyShuntingListVo.getModelSid();
+                String configSid = appCompanyShuntingListVo.getConfigSid();
+                Map<String, Object> map = new HashMap<>();
+                map.put("modelSid", modelSid);
+                map.put("configSid", configSid);
+                map.put("selectType",0);
+                appSubVersionVo.setJson(JSONObject.toJSONString(map));
+                BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo);
+                appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo);
+
+            });
+        }
         vo.setRecords(records);
         return rb.success().setData(vo);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.buscenter"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin"})
 public class BusCenterApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubVersionVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.portal.api.appsubsetversion;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/26 10:25
+ * @Description
+ */
+@Data
+public class AppSubVersionVo implements Vo {
+    private static final long serialVersionUID = 8313504810132137065L;
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java

@@ -58,4 +58,9 @@ public interface AppSubsetVersionFeign {
     @ApiOperation("根据appSid查询最新模块信息")
     @GetMapping("/getLastByAppSid/{appSid}")
     public ResultBean<AppSubsetVersionVo> getLastByAppSid(@PathVariable("appSid") String appSid);
+
+    @ApiOperation("查询插件最新模块信息")
+    @GetMapping("/getLastByAppSid")
+    ResultBean<AppSubVersionVo> selectLast();
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeignFallback.java

@@ -48,4 +48,9 @@ public class AppSubsetVersionFeignFallback implements AppSubsetVersionFeign {
 	public ResultBean getLastByAppSid(String appSid) {
 		return ResultBean.fireFail().setMsg("接口anrui-portal/appsubsetversion/getLastByAppSid无法访问");
 	}
+
+	@Override
+	public ResultBean<AppSubVersionVo> selectLast() {
+		return null;
+	}
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionVo.java

@@ -69,4 +69,7 @@ public class AppSubsetVersionVo implements Vo {
     
 	@ApiModelProperty("排序")
     private Integer sortNo;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java

@@ -226,4 +226,18 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign {
         }
         return new ResultBean<AppSubsetVersionVo>().success().setData(vo);
     }
+
+    @Override
+    public ResultBean<AppSubVersionVo> selectLast() {
+        ResultBean<AppSubVersionVo> rb = ResultBean.fireFail();
+        AppSubVersionVo vo = new AppSubVersionVo();
+        String appSid = "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028";
+        ResultBean<AppSubsetVersionVo> resultBean = getLastByAppSid(appSid);
+        AppSubsetVersionVo appSubsetVersionVo = resultBean.getData();
+        BeanUtil.copyProperties(appSubsetVersionVo, vo);
+        vo.setModuleVersion(appSubsetVersionVo.getVersionCode());
+        vo.setPath(fileUploadComponent.getUrlPrefix() + appSubsetVersionVo.getUpdateUrl());
+        vo.setModuleAction("com.anrui.android.plugin.autoservice.common.CarlModelConfigDetailActivity");
+        return rb.success().setData(vo);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -26,15 +26,12 @@
 package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
-import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -352,10 +349,16 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
                     String sid = businessSid;
                     BaseOutsourcingApplicationDetailsVo applicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(sid).getData();
+                    if(applicationDetailsVo != null){
+                        if(StringUtils.isNotBlank(applicationDetailsVo.getManufactorSettlementPrice())){
                             baseVehicleDto.setContractPrice(Integer.valueOf(applicationDetailsVo.getManufactorSettlementPrice())); // 厂家合同价
+                        }
+                        if(StringUtils.isNotBlank(applicationDetailsVo.getPurchasePrice())){
                             baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
+                        }
                         baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
                         baseVehicleDto.setInsideCode(applicationDetailsVo.getInsideCode());
+                    }
                     baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
                     baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
                     baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());