修改移动端详情中拼接上装字段补充

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

@@ -1932,8 +1932,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (!isDeposit) {
             return rb.setMsg("请完善订金信息");
         }
-        if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){
-            return rb.setMsg("请完善保险信息");
+        if(StringUtils.isBlank(busSalesOrder.getIsInsurance())){
+            return rb.setMsg("请先完善保险信息");
         }else{
             if("0".equals(busSalesOrder.getIsInsurance())){
                 BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -63,13 +63,22 @@
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸：', overallDimension),
                           NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(color))) > 0, GROUP_CONCAT('颜色：', color),
+                          NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质：', plateMaterial),
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度：', plateThickness),
                           NULL),
-                       IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号：', announcementModel),
-                          NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice),
-                                    NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道：', tarpaulinSlide),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(refirgerator))) > 0, GROUP_CONCAT('冷藏冷机：', refirgerator),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(selfUnHyCoPl))) > 0, GROUP_CONCAT('自卸液压盖版：', selfUnHyCoPl),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(floorHeating))) > 0, GROUP_CONCAT('底板加热：', floorHeating),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice, '元'),
+                          NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig),
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注：', remarks),