bug修复

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

@@ -377,7 +377,7 @@ public class InvestorController {
     @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->获取树结构")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/getTree")
-    public AjaxResult<UserGroupTreeResult> getTree(HttpServletRequest request) {
+    public AjaxResult<UserGroupTradeConfigTreeVo> getTree(HttpServletRequest request) {
         return iUseraccountService.getTree(request);
     }
 

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

@@ -63,7 +63,7 @@ public interface IUseraccountService extends IService<Useraccount> {
 
     AjaxResult deleteConfig(Long accountid, HttpServletRequest request);
 
-    AjaxResult<UserGroupTreeResult> getTree(HttpServletRequest request);
+    AjaxResult<UserGroupTradeConfigTreeVo> getTree(HttpServletRequest request);
 
     AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request);
 

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

@@ -116,7 +116,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     private RabbitTemplate rabbitTemplate;
     @Resource
     private IBankAccountsignMapper iBankAccountsignMapper;
-
+    @Resource
+    private IGoodsexMapper iGoodsexMapper;
 
     @Override
     public PageResult<DealerQueryResult> queryOrganPage(DealerQueryParam dealerQueryParam, HttpServletRequest request) {
@@ -1110,7 +1111,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     }
 
     @Override
-    public AjaxResult<UserGroupTreeResult> getTree(HttpServletRequest request) {
+    public AjaxResult<UserGroupTradeConfigTreeVo> getTree(HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         List<Usergroup> groupList = iUsergroupMapper.selectList(new QueryWrapper<>());
         List<UserGroupTradeConfigTreeVo> result = new ArrayList<>();
@@ -1121,7 +1122,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 Market marketid = iMarketMapper.selectOne(new QueryWrapper<Market>().eq("marketid", fig.getMarketid()));
                 fig.setMarketname(marketid.getMarketname());
                 Goods goods = iGoodsMapper.selectOne(new QueryWrapper<Goods>().eq("goodsid", fig.getGoodsid()));
+                Goodsex goodsid = iGoodsexMapper.selectOne(new QueryWrapper<Goodsex>().eq("goodsid", goods.getGoodsid()));
                 fig.setGoodsname(goods.getGoodsname());
+                if(goodsid != null){
+                    fig.setGoodsnameen(goodsid.getGoodsnameen());
+                    fig.setGoodsnamevi(goodsid.getGoodsnamevi());
+                    fig.setGoodsnametw(goodsid.getGoodsnametw());
+                    fig.setGoodsnameth(goodsid.getGoodsnameth());
+                }
                 Long key = fig.getUsergroupid();
                 if (group.containsKey(key)) {
                     group.get(key).add(fig);
@@ -1169,6 +1177,10 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                             vo2.setLevel(3);
                             //商品名称
                             vo2.setName(fig.getGoodsname());
+                            vo2.setNamevi(fig.getGoodsnamevi());
+                            vo2.setNameen(fig.getGoodsnameen());
+                            vo2.setNametw(fig.getGoodsnametw());
+                            vo2.setNameth(fig.getGoodsnameth());
                             vo2.setUsergroupid(fig.getUsergroupid());
                             vo2.setMarketid(fig.getMarketid());
                             vo2.setGoodsid(fig.getGoodsid());
@@ -1182,6 +1194,10 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     vo1.setLevel(2);
                     //市场名称
                     vo1.setName(base.getMarketname());
+                    vo1.setNamevi(base.getMarketname());
+                    vo1.setNameen(base.getMarketname());
+                    vo1.setNametw(base.getMarketname());
+                    vo1.setNameth(base.getMarketname());
                     vo1.setUsergroupid(base.getUsergroupid());
                     vo1.setMarketid(base.getMarketid());
                     result.add(vo1);
@@ -1194,6 +1210,10 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         defaultVO.setPid("-1");
         defaultVO.setLevel(1);
         defaultVO.setName(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNamevi(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNameen(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNametw(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNameth(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
         defaultVO.setUsergroupid(0L);
         result.add(defaultVO);
 

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Goodsex;
+
+/**
+ * <p>
+ * 商品合约扩展表(通用) Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-04-25
+ */
+public interface IGoodsexMapper extends BaseMapper<Goodsex> {
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Goodsex.java

@@ -0,0 +1,216 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 商品合约扩展表(通用)
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-04-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("GOODSEX")
+@ApiModel(value="Goodsex对象", description="商品合约扩展表(通用)")
+public class Goodsex extends Model<Goodsex> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "期货合约ID")
+    @TableId(value = "GOODSID")
+    private Long goodsid;
+
+    @ApiModelProperty(value = "所属市场ID")
+    @TableField("MARKETID")
+    private Long marketid;
+
+    @ApiModelProperty(value = "滞纳金起计天数（52）")
+    @TableField("LATEFEEDAYS")
+    private Integer latefeedays;
+
+    @ApiModelProperty(value = "滞纳金收取方式 1：比率  2：固定（52）")
+    @TableField("LATEFEEALGORITHM")
+    private Integer latefeealgorithm;
+
+    @ApiModelProperty(value = "滞纳金收取值（52）")
+    @TableField("LATEFEEVALUE")
+    private BigDecimal latefeevalue;
+
+    @ApiModelProperty(value = "买交收升贴水（52）")
+    @TableField("BUYPREMIUM")
+    private BigDecimal buypremium;
+
+    @ApiModelProperty(value = "卖交收升贴水（52）")
+    @TableField("SELLPREMIUM")
+    private BigDecimal sellpremium;
+
+    @ApiModelProperty(value = "提示定金率（52）")
+    @TableField("PROMPTDEPOSITRATE")
+    private BigDecimal promptdepositrate;
+
+    @ApiModelProperty(value = "斩仓定金率（52）")
+    @TableField("CUTDEPOSITRATE")
+    private BigDecimal cutdepositrate;
+
+    @ApiModelProperty(value = "定金率是否变更 - 0:否 1:是（52）")
+    @TableField("ISDEPOSITCHANGED")
+    private Integer isdepositchanged;
+
+    @ApiModelProperty(value = "是否全部单据生效 - 0:否(仅新单据生效) 1:是(全部单据生效)（52）")
+    @TableField("ISTOALL")
+    private Integer istoall;
+
+    @ApiModelProperty(value = "新提示定金率（52）")
+    @TableField("NEWPROMPTDEPOSITRATE")
+    private BigDecimal newpromptdepositrate;
+
+    @ApiModelProperty(value = "新斩仓定金率（52）")
+    @TableField("NEWCUTDEPOSITRATE")
+    private BigDecimal newcutdepositrate;
+
+    @ApiModelProperty(value = "最小交收手数(50-线下交收)")
+    @TableField("MINDELIVERYLOT")
+    private Long mindeliverylot;
+
+    @ApiModelProperty(value = "点差下限(46)")
+    @TableField("MINSPREAD")
+    private BigDecimal minspread;
+
+    @ApiModelProperty(value = "点差上限(46)")
+    @TableField("MAXSPREAD")
+    private BigDecimal maxspread;
+
+    @ApiModelProperty(value = "商品显示顺序(99)")
+    @TableField("GOODSORDER")
+    private String goodsorder;
+
+    @ApiModelProperty(value = "是否允许自动追加定金: 0-否 1-是(52)")
+    @TableField("CANAUTOADDDEPOSIT")
+    private Integer canautoadddeposit;
+
+    @ApiModelProperty(value = "自动追加定金率(52) - 允许时显示")
+    @TableField("ADDDEPOSITRATE")
+    private BigDecimal adddepositrate;
+
+    @ApiModelProperty(value = "是否允许自动退还定金: 0-否 1-是(52)")
+    @TableField("CANAUTOREFUNDDEPOSIT")
+    private Integer canautorefunddeposit;
+
+    @ApiModelProperty(value = "新自动追加定金率(52) - 允许时显示")
+    @TableField("NEWADDDEPOSITRATE")
+    private BigDecimal newadddepositrate;
+
+    @ApiModelProperty(value = "定金率修改待审核标识(52) - 0:不需审核 1:待审核")
+    @TableField("DRAUDITFLAG")
+    private Integer drauditflag;
+
+    @ApiModelProperty(value = "临时转让定金比例(49)")
+    @TableField("TMPTRANSFERDEPOSITRATIO")
+    private BigDecimal tmptransferdepositratio;
+
+    @ApiModelProperty(value = "期货合约名称泰文)")
+    @TableField("GOODSNAMETH")
+    private String goodsnameth;
+
+    @ApiModelProperty(value = "期货合约名称(英文)")
+    @TableField("GOODSNAMEEN")
+    private String goodsnameen;
+
+    @ApiModelProperty(value = "期货合约名称(繁体)")
+    @TableField("GOODSNAMETW")
+    private String goodsnametw;
+
+    @ApiModelProperty(value = "买交收升贴水算法(验收费) - 1:比率 2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("BUYPRICEMOVEALGORITHM")
+    private Integer buypricemovealgorithm;
+
+    @ApiModelProperty(value = "买交收升贴水值(验收费)")
+    @TableField("BUYPRICEMOVEVALUE")
+    private BigDecimal buypricemovevalue;
+
+    @ApiModelProperty(value = "买交收运费算法(税费) - 1:比率  2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("BUYSHIPPINGFEEALGORITHM")
+    private Integer buyshippingfeealgorithm;
+
+    @ApiModelProperty(value = "买交收运费值(税费)")
+    @TableField("BUYSHIPPINGFEEVALUE")
+    private BigDecimal buyshippingfeevalue;
+
+    @ApiModelProperty(value = "买交收其它费用算法(去掉) - 1:比率 2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("BUYOTHERFEEALGORITHM")
+    private Integer buyotherfeealgorithm;
+
+    @ApiModelProperty(value = "买交收其它费用值(去掉)")
+    @TableField("BUYOTHERFEEVALUE")
+    private BigDecimal buyotherfeevalue;
+
+    @ApiModelProperty(value = "卖交收升贴水算法(验收费) - 1:比率 2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("SELLPRICEMOVEALGORITHM")
+    private Integer sellpricemovealgorithm;
+
+    @ApiModelProperty(value = "卖交收升贴水值(验收费)")
+    @TableField("SELLPRICEMOVEVALUE")
+    private BigDecimal sellpricemovevalue;
+
+    @ApiModelProperty(value = "卖交收运费算法(税费) - 1:比率 2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("SELLSHIPPINGFEEALGORITHM")
+    private Integer sellshippingfeealgorithm;
+
+    @ApiModelProperty(value = "卖交收运费值(税费)")
+    @TableField("SELLSHIPPINGFEEVALUE")
+    private BigDecimal sellshippingfeevalue;
+
+    @ApiModelProperty(value = "卖交收其它费用算法(暂不用) - 1:比率 2：固定(每单位) - 枚举:premiumAutoMode")
+    @TableField("SELLOTHERFEEALGORITHM")
+    private Integer sellotherfeealgorithm;
+
+    @ApiModelProperty(value = "卖交收其它费用值(暂不用)")
+    @TableField("SELLOTHERFEEVALUE")
+    private BigDecimal sellotherfeevalue;
+
+    @ApiModelProperty(value = "最大持仓天数(52) -1为不强平")
+    @TableField("CLOSEDDAYS")
+    private Long closeddays;
+
+    @ApiModelProperty(value = "日最大交收数量(52, -1为不限)")
+    @TableField("DAILYMAXBUYDELIVERYQTY")
+    private Long dailymaxbuydeliveryqty;
+
+    @ApiModelProperty(value = "日最大交收数量(52, -1为不限)")
+    @TableField("DAILYMAXSELLDELIVERYQTY")
+    private Long dailymaxselldeliveryqty;
+
+    @ApiModelProperty(value = "协议转让最小价格(-1为不限)")
+    @TableField("TRANSFERMINPIRCE")
+    private BigDecimal transferminpirce;
+
+    @ApiModelProperty(value = "协议转让最大价格(-1为不限)")
+    @TableField("TRANSFERMAXPIRCE")
+    private BigDecimal transfermaxpirce;
+
+    @ApiModelProperty(value = "期货合约名称(越南语)")
+    @TableField("GOODSNAMEVI")
+    private String goodsnamevi;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.goodsid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Usergrouptradeconfig.java

@@ -78,6 +78,14 @@ public class Usergrouptradeconfig extends Model<Usergrouptradeconfig> {
 
     @TableField(select = false)
     private String goodsname;
+    @TableField(select = false)
+    private String goodsnameth;
+    @TableField(select = false)
+    private String goodsnameen;
+    @TableField(select = false)
+    private String goodsnametw;
+    @TableField(select = false)
+    private String goodsnamevi;
 
     @TableField(select = false)
     private String marketname;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserGroupTradeConfigTreeVo.java

@@ -1,5 +1,6 @@
 package com.muchinfo.mtp3pojos.vo.investor;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,6 +20,11 @@ public class UserGroupTradeConfigTreeVo {
 
     private String name;
 
+    private String nameth;
+    private String nameen;
+    private String nametw;
+    private String namevi;
+
     private Integer level;
 
     private Long usergroupid;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserGroupTreeResult.java

@@ -1,29 +0,0 @@
-package com.muchinfo.mtp3pojos.vo.investor;
-
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(value = "UserGroupTreeResult对象", description = "交易商个性化树结构")
-public class UserGroupTreeResult {
-
-    private String id;
-
-    private String pid;
-
-    private String name;
-
-    private Integer level;
-
-    private Long usergroupid;
-
-    private Long marketid;
-
-    private Long goodsid;
-}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/UserAccountSignlogResult.java

@@ -18,7 +18,7 @@ public class UserAccountSignlogResult {
     private Long accountcode;
 
     @ApiModelProperty(value = "托管银行编号")
-    private Long cusbankid;
+    private String cusbankid;
 
     @ApiModelProperty(value = "签(解)约类型")
     private Integer signtype;