Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -273,3 +273,10 @@ ALTER TABLE `sys_pc_address_history` ADD COLUMN `district` varchar(30) COLLATE u
 
 -- add by  hxl  2024-09-04
 ALTER TABLE `sys_dept_internal_agent` ADD COLUMN `bind_dept_id` varchar(30) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '绑定机构id';
+-- add by  helixiao  2024-09-11
+ALTER TABLE `sys_geography_position` ADD COLUMN  `leader_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '领导人姓名';
+ALTER TABLE `sys_geography_position_record` ADD COLUMN  `source` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构来源(1-渠道、2-个代)';
+
+ALTER TABLE `sys_pc_address` ADD COLUMN  `leader_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '领导人姓名';
+ALTER TABLE `sys_pc_address_history` ADD COLUMN  `source` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '机构来源(1-渠道、2-个代)';
+ALTER TABLE sys_pc_address_history RENAME COLUMN 'prov' TO 'province';

src/main/java/com/ydtech/modules/admin/controller/websocket/WebSocketServer.java

@@ -170,6 +170,7 @@ public class WebSocketServer {
             sysGeographyPosition1.setAddress(province + city + district + street+streetNum+poiName+cityCode);
             sysGeographyPosition1.setCreateTime(new Date());
             sysGeographyPosition1.setSource(sysDept.getManagementSource());
+            sysGeographyPosition1.setLeaderName(sysUser.getLeaderName());
             sysGeographyPositionService.updateById(sysGeographyPosition1);
 
             SysGeographyPositionRecord sysGeographyPositionRecord = BeanUtil.copyProperties(sysGeographyPosition1, SysGeographyPositionRecord.class);

src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java

@@ -127,7 +127,7 @@ public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMappe
             feeLookSwitchesDTO.setFeeDisplay(isEnabled(SwitchConfig.FDA_01.getCode()));
         }else {
             feeLookSwitchesDTO.setFeeView(true);
-            feeLookSwitchesDTO.setFeeDisplay(true);
+            feeLookSwitchesDTO.setFeeDisplay(false);
         }
         return feeLookSwitchesDTO;
     }

src/main/java/com/ydtech/modules/fee/controller/ConfigController.java

@@ -4,7 +4,6 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.dto.po.InsFeeOrderConfig;
 import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
-import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/ydtech/modules/fee/service/impl/FeeDisplayServiceImpl.java

@@ -28,12 +28,13 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
     public void setUpFeePresentationFormat(OrderVo orderVo) {
         FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
         FeeOrderNewVo feeOrderNewVo = orderVo.getFeeOrderNewVo();
-        if (feeLookSwitchesDTO.getFeeDisplay()) {
+        if (!feeLookSwitchesDTO.getFeeDisplay()) {
             List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
             exportFee.forEach(FeeOrderNewVo.ExportFee::feeVacant);
         } else if (feeLookSwitchesDTO.getFeeView()) {
             List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
             exportFee.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
+            orderVo.setSumFee(new BigDecimal(orderVo.getSumFee()).divide(new BigDecimal(10)).toString());
         }
         orderVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
         orderVo.setFeeView(feeLookSwitchesDTO.getFeeView());
@@ -43,7 +44,7 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
     @Override
     public void setUpRevise(List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos) {
         FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
-        if (feeLookSwitchesDTO.getFeeDisplay()) {
+        if (!feeLookSwitchesDTO.getFeeDisplay()) {
             insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeVacant);
         } else if (feeLookSwitchesDTO.getFeeView()) {
             insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeDivideBy10);
@@ -57,7 +58,7 @@ public class FeeDisplayServiceImpl implements FeeDisplayService {
     @Override
     public void setQuote(QuoteRespVo quoteRespVo) {
         FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
-        if (feeLookSwitchesDTO.getFeeDisplay()) {
+        if (!feeLookSwitchesDTO.getFeeDisplay()) {
             quoteRespVo.feeVacant();
         } else if (feeLookSwitchesDTO.getFeeView()) {
             quoteRespVo.feeDivideBy10();

src/main/resources/mapper/modules/admin/SysTelemarketingWechatDataMapper.xml

@@ -84,7 +84,7 @@
         <where>
             user_id =#{vo.userId}
             <if test="vo.beginDate != null and vo.beginDate != ''  and vo.endDate != null and vo.endDate != '' ">
-                AND  calldate  BETWEEN  #{vo.beginDate}  AND  #{vo.endDate}
+                AND  create_time  BETWEEN  #{vo.beginDate}  AND  #{vo.endDate}
             </if>
         </where>
     </select>