调整日志输出以及输出位置，更改交易商个性化接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/configuration/RabbitConfig.java

@@ -15,9 +15,9 @@ public class RabbitConfig {
     @Value("${rabbitmq.template.exchange}")
     private String exchangeName;
 
-    /*
+    /**
     *   解决占位符
-    * */
+    */
     @Bean
     public static PropertySourcesPlaceholderConfigurer placeholderConfigurer(){
         PropertySourcesPlaceholderConfigurer placeholderConfigurer = new PropertySourcesPlaceholderConfigurer();

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java

@@ -385,18 +385,17 @@ public class InvestorController {
         return iUseraccountService.initGoodsAndBZ(usergroupid, marketid, goodsid, request);
     }
 
-    @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增-->选择商品获取规则配置")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/initGoodsForRuleAndFee")
-    public AjaxResult<InvestorInitPerAddResult> initGoodsForRuleAndFee(Long marketid, Long goodsid, HttpServletRequest request) {
-        return iUseraccountService.initGoodsForRuleAndFee(marketid, goodsid, request);
-    }
-
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增/修改")
     @ResponseBody
     @RequestMapping(method = RequestMethod.POST, value = "/traderPersonAdd")
-    public AjaxResult traderPersonAdd(@RequestBody InvestorPersonAddParam param, HttpServletRequest request) {
-        return iUseraccountService.traderPersonAdd(param, request);
+    public AjaxResult traderPersonAdd(@RequestBody String param, HttpServletRequest request) {
+        try {
+            InvestorPersonAddParam updateParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), InvestorPersonAddParam.class);
+            return iUseraccountService.traderPersonAdd(updateParam, request);
+        } catch (Exception e) {
+            log.error("分组交易商新增失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->删除")

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IUseraccountService.java

@@ -68,8 +68,6 @@ public interface IUseraccountService extends IService<Useraccount> {
 
     AjaxResult traderPersonAdd(InvestorPersonAddParam param, HttpServletRequest request);
 
-    AjaxResult<InvestorInitPerAddResult> initGoodsForRuleAndFee(Long marketid, Long goodsid, HttpServletRequest request);
-
     AjaxResult deleteTraderConfig(InvestorPersonDeleteParam param, HttpServletRequest request);
 
     AjaxResult<UserGroupTradeConfigVo> tradeConfigView(InvestorPersonViewParam param, HttpServletRequest request);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -1185,13 +1185,6 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         if (usergroupid == null) {
             QueryWrapper<Usergroup> wrapper = new QueryWrapper<>();
             wrapper.eq("areauserid", systemmanager.getAreauserid());
-            // 添加不存在子查询的条件
-            wrapper.notExists(
-                    "select 1 from usergrouptradeconfig u " +
-                            "where " +
-                            "<if test='memberuserid != null'>u.memberuserid = #{memberuserid} and </if>" +
-                            "USERGROUP.autoid = u.usergroupid"
-            );
             result.setUserGroups(iUsergroupMapper.selectList(wrapper));
             result.setMarkets(iMarketMapper.getNoTradeConfigMarkets(systemmanager.getAreauserid(), usergroupid));
         } else {
@@ -1201,6 +1194,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 if(goodsid == null){
                     result.setGoods(iGoodsMapper.getNoTradeConfigGoods(systemmanager.getAreauserid(), usergroupid, marketid));
                 }else{
+                    result.setFeesConfigVos(getTradeFeeDescriptions(marketid, goodsid, systemmanager.getAreauserid()));
+                    result.setRulesConfigVos(getTradeRuleDescriptions(marketid, goodsid, systemmanager.getAreauserid()));
                     //客户类别
                     result.setResults(iUseraccountMapper.getCustomerTypeByGoodsid(goodsid, null));
                 }
@@ -1324,17 +1319,6 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     }
 
     @Override
-    public AjaxResult<InvestorInitPerAddResult> initGoodsForRuleAndFee(Long marketid, Long goodsid, HttpServletRequest request) {
-        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        InvestorInitPerAddResult result = new InvestorInitPerAddResult();
-        List<FeesConfigVo> feeVo = getTradeFeeDescriptions(marketid, goodsid, systemmanager.getAreauserid());
-        result.setFeesConfigVos(feeVo);
-        List<RulesConfigVo> rulesVos = getTradeRuleDescriptions(marketid, goodsid, systemmanager.getAreauserid());
-        result.setRulesConfigVos(rulesVos);
-        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
-    }
-
-    @Override
     public AjaxResult deleteTraderConfig(InvestorPersonDeleteParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         QueryWrapper<Usergrouptradeconfig> queryWrapper = new QueryWrapper<>();
@@ -1353,8 +1337,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     public AjaxResult<UserGroupTradeConfigVo> tradeConfigView(InvestorPersonViewParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
 
-        List<RulesConfigVo> ruleList = iUseraccountMapper.getTradeRuleDescriptions(param.getMarketid(), param.getGoodsid(), systemmanager.getAreauserid());
-        List<FeesConfigVo> feeList = iUseraccountMapper.getTradeFeeDescriptions(param.getMarketid(), param.getGoodsid(), systemmanager.getAreauserid());
+        List<RulesConfigVo> ruleList = iUseraccountMapper.getTradeRuleDescriptions(param.getMarketid(), param.getGoodsid(), systemmanager.getAreauserid(),param.getUsergroupid());
+        List<FeesConfigVo> feeList = iUseraccountMapper.getTradeFeeDescriptions(param.getMarketid(), param.getGoodsid(), systemmanager.getAreauserid(),param.getUsergroupid());
 
         Object o = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "007");
         if (o != null && "1".equals(o.toString())) {
@@ -1455,7 +1439,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     }
 
     private List<RulesConfigVo> getTradeRuleDescriptions(Long marketid, Long goodsid, Long areauserid) {
-        List<RulesConfigVo> list = iUseraccountMapper.getTradeRuleDescriptions(marketid, goodsid, areauserid);
+        List<RulesConfigVo> list = iUseraccountMapper.getTradeRuleDescriptions(marketid, goodsid, areauserid,null);
 
         if (list != null && !list.isEmpty()) {
             Object o = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "007");
@@ -1489,7 +1473,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     }
 
     private List<FeesConfigVo> getTradeFeeDescriptions(Long marketid, Long goodsid, Long areauserid) {
-        List<FeesConfigVo> list = iUseraccountMapper.getTradeFeeDescriptions(marketid, goodsid, areauserid);
+        List<FeesConfigVo> list = iUseraccountMapper.getTradeFeeDescriptions(marketid, goodsid, areauserid,null);
         if (list != null && !list.isEmpty()) {
             Object o = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "007");
             if (o != null && "1".equals(o.toString())) {

mtp3-century/src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
     <!-- 定义应用名称，区分应用 -->
     <property name="APP_NAME" value="logback-century"/>
     <!-- 定义日志文件的输出路径 -->
-    <property name="LOG_PATH" value="./log/${APP_NAME}"/>
+    <property name="LOG_PATH" value="${user.dir}/log/${APP_NAME}"/>
     <!-- 定义日志文件名称和路径 -->
     <property name="LOG_FILE" value="${LOG_PATH}/info/application.log"/>
 
@@ -43,7 +43,7 @@
     </appender>
 
     <!-- 配置输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- 加入控制台输出 -->
         <appender-ref ref="CONSOLE"/>
         <!-- 加入APPLICATION输出 -->

mtp3-century/src/main/resources/mapper/MarketMapper.xml

@@ -82,10 +82,5 @@
         and t.trademode not in(40,41)
         and t.marketid in ( select marketid from arearolemarket a
         where <if test="areauserid != null">a.areauserid = #{areauserid} and</if>  a.roletype = 7)
-        <if test="usergroupid != null">
-            and not exists ( select 1 from usergrouptradeconfig u
-            where <if test="areauserid != null">u.memberuserid=#{areauserid} and</if> u.marketid = t.marketid
-            and u.usergroupid = #{usergroupid})
-        </if>
     </select>
 </mapper>

mtp3-century/src/main/resources/mapper/UseraccountMapper.xml

@@ -650,6 +650,7 @@
         and e.enumitemstatus = 1 and g.goodsid = #{goodsid}
         and e.enumitemname = r.customertype
         and r.riskcontrolmode=1
+        and e.enumdiccode='customerType'
         <if test="customertypeid != null  and customertypeid != ''">
             and g.customertypeid=#{customertypeid}
         </if>
@@ -673,11 +674,23 @@
         where t.goodsgroupid = gp.goodsgroupid and t.ruleid not in (select ruleid from baserule)
         and t.goodsgroupid=(select g.goodsgroupid from goods g where g.goodsid=#{goodsid})
         )
+        <if test="usergroupid != null">
+            , co as (select u.paramid, u.paramvalue from usergrouptradeconfig u
+            where u.ruletype=2 <if test="areauserid != null">and u.memberuserid = #{areauserid}</if> and
+            u.usergroupid=#{usergroupid} and u.marketid = #{marketid} and u.goodsid = #{goodsid}
+            )
+        </if>
         select t.*,g.qtydecimalplace,g.paramvalue,cf.paramvalue dvalue
+        <if test="usergroupid != null">
+            ,co.paramvalue cvalue
+        </if>
         from traderuledescription t
         left join traderuleconfig c on t.ruleid = c.ruleid and c.ispersonalized = 1
         left join jjs g on t.ruleid = g.ruleid
         left join cf cf on t.ruleid = cf.paramid
+        <if test="usergroupid != null">
+            left join co co on t.ruleid = co.paramid
+        </if>
         where c.trademodeid = (select m.trademode from market m where m.marketid = #{marketid} )
     </select>
 
@@ -701,13 +714,25 @@
         where t.goodsgroupid=(select g.goodsgroupid from goods g where g.goodsid=#{goodsid})
         and t.tradefeeid not in (select tradefeeid from basefee)
         )
+        <if test="usergroupid != null">
+            , co as (select u.paramid,u.feealgorithm, u.paramvalue from usergrouptradeconfig u
+            where u.ruletype=3 <if test="areauserid != null">and u.memberuserid = #{areauserid}</if> and
+            u.usergroupid=#{usergroupid} and u.marketid = #{marketid} and u.goodsid = #{goodsid}
+            )
+        </if>
         select t.*,g.feealgorithm, g.memberminvalue,g.membermaxvalue,
         cf.feealgorithm drithm, cf.paramvalue dvalue
+        <if test="usergroupid != null">
+            ,co.feealgorithm crithm,co.paramvalue cvalue
+        </if>
        ,g.memberdefaultvalue exchangevalue
         from tradefeedescription t
         left join jjs g on t.tradefeeid = g.tradefeeid
         left join tradefeeconfig c on t.tradefeedescriptionid = c.tradefeedescriptionid and c.ispersonalized = 1
         left join cf cf on t.tradefeeid = cf.paramid
+        <if test="usergroupid != null">
+            left join co co on t.tradefeeid = co.paramid
+        </if>
         where c.tradepropertyid=(select m.tradeproperty from market m where m.marketid = #{marketid})
         and g.feealgorithm is not null
     </select>

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/GlobalExceptionEnum.java

@@ -5,17 +5,17 @@ import lombok.Getter;
 @Getter
 public enum GlobalExceptionEnum {
     // 1. 字段(枚举实例)
-    ERROR(500, "系统异常,请稍后再试!"),
+    ERROR(500, "System exception, please contact the management personnel!"),
 
-    SUCCESS(200, "操作成功!"),
+    SUCCESS(200, "Operation successful!"),
 
-    PHONE_IS_NULL_ERROR(1001, "电话不能为空"),
+    PHONE_IS_NULL_ERROR(1001, "Phone cannot be empty"),
 
-    PARAM_ERROR(1002, "参数校验异常"),
+    PARAM_ERROR(1002, "Parameter verification exception"),
 
-    DELETE_ERROR(1101, "删除错误"),
+    DELETE_ERROR(1101, "Deletion"),
 
-    UPLOAD_ERROR(1102, "上传文件失败错误"),
+    UPLOAD_ERROR(1102, "Upload file failed with error"),
     ;
 
 

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IUseraccountMapper.java

@@ -75,7 +75,7 @@ public interface IUseraccountMapper extends BaseMapper<Useraccount> {
 
     List<InvestorInitBZResult> getCustomerTypeByGoodsid(@Param("goodsid")Long goodsid,@Param("customertypeid")Integer customertypeid);
 
-    List<RulesConfigVo> getTradeRuleDescriptions(@Param("marketid")Long marketid,@Param("goodsid") Long goodsid,@Param("areauserid") Long areauserid);
+    List<RulesConfigVo> getTradeRuleDescriptions(@Param("marketid")Long marketid,@Param("goodsid") Long goodsid,@Param("areauserid") Long areauserid,@Param("usergroupid")Long usergroupid);
 
-    List<FeesConfigVo> getTradeFeeDescriptions(@Param("marketid")Long marketid,@Param("goodsid") Long goodsid,@Param("areauserid") Long areauserid);
+    List<FeesConfigVo> getTradeFeeDescriptions(@Param("marketid")Long marketid,@Param("goodsid") Long goodsid,@Param("areauserid") Long areauserid,@Param("usergroupid")Long usergroupid);
 }