新增内部订单查询-->成交汇总查询、交收委托查询

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

@@ -1,14 +1,12 @@
 package com.muchinfo.mtp3century.controller;
 
 import com.muchinfo.mtp3century.service.IBankAccountSignService;
-import com.muchinfo.mtp3century.service.ICommonService;
 import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
 import com.muchinfo.mtp3pojos.vo.bankaccountsign.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -207,8 +207,8 @@ public class CommonController {
     @ApiOperation("商品查询下拉框")
     @RequestMapping(method = RequestMethod.GET, value = "/queryGoodsSelect")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request) {
-        return iCommonService.queryGoodsSelect(goodsStatusIds, marketId, searchCode, request);
+    private AjaxResult<GoodsSelectResult> queryGoodsSelect(GoodsSelectParam param, HttpServletRequest request) {
+        return iCommonService.queryGoodsSelect(param, request);
     }
 
     @ApiOperation("获取市场下拉列表")

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

@@ -125,9 +125,10 @@ public class InvestorController {
     @ApiOperation("交易商管理-->交易商管理-->修改")
     @RequestMapping(method = RequestMethod.POST, value = "/investorEdit")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    public AjaxResult investorEdit(@RequestBody DetailBeforeResult param, HttpServletRequest request) {
+    public AjaxResult investorEdit(@RequestBody String param, HttpServletRequest request) {
         try {
-            return iUseraccountService.investorEdit(param, request);
+            DetailBeforeResult currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), DetailBeforeResult.class);
+            return iUseraccountService.investorEdit(currentVo, request);
         } catch (Exception e) {
             log.error("交易商修改失败，失败原因：" + e);
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
@@ -171,7 +172,7 @@ public class InvestorController {
             InvestorTaAccountUpdateParam updateParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), InvestorTaAccountUpdateParam.class);
             return iTaaccountService.edit(updateParam, request);
         } catch (Exception e) {
-            log.error("交易商开户失败，失败原因：" + e);
+            log.error("交易商资金账户修改失败，失败原因：" + e);
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -214,8 +215,8 @@ public class InvestorController {
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->查看手机号")
     @RequestMapping(method = RequestMethod.GET, value = "/queryUserAuthInfo")
-    public AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, Integer authtype, HttpServletRequest request) {
-        return iDealLoginService.queryUserAuthInfo(loginid, authtype, request);
+    public AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, HttpServletRequest request) {
+        return iDealLoginService.queryUserAuthInfo(loginid, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->交易商管理导出")

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

@@ -1,7 +1,6 @@
 package com.muchinfo.mtp3century.controller;
 
 import com.muchinfo.mtp3century.service.IOrganService;
-import com.muchinfo.mtp3century.service.ITaaccountService;
 import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.MessageType;

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

@@ -12,11 +12,14 @@ import com.muchinfo.mtp3pojos.vo.query.commission.CommissionSheetResultDetail;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetParam;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResult;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResultDetail;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.*;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.position.*;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryParam;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.warehouse.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -245,4 +248,43 @@ public class QueryController {
         return iQueryService.queryGoodsTradeExport(param, request);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/queryTradeSum")
+    @ResponseBody
+    @ApiOperation("内部订单查询--> 成交汇总查询 --> 获取列表 ")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public PageResult<TradeSumQueryResult> queryTradeSum(TradeSumQueryParam param, HttpServletRequest request) {
+        return iQueryService.queryTradeSum(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/exportTradeSum")
+    @ResponseBody
+    @ApiOperation("内部订单查询--> 成交汇总查询 --> 导出列表 ")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public AjaxResult exportTradeSum(TradeSumQueryParam param, HttpServletRequest request) {
+        return iQueryService.exportTradeSum(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/queryDeliveryOrder")
+    @ResponseBody
+    @ApiOperation("内部订单查询--> 交收委托查询 --> 获取列表 ")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public PageResult<DeliveryOrderEntrustResult> queryDeliveryOrder(DeliveryOrderEntrustParam param, HttpServletRequest request) {
+        return iQueryService.queryDeliveryOrder(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/queryWRStandard")
+    @ResponseBody
+    @ApiOperation("内部订单查询--> 交收委托查询 --> 获取现货商品 ")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public AjaxResult<DeliveryOrderWrsResult> queryWRStandard(DeliveryOrderWrsParam param, HttpServletRequest request) {
+        return iQueryService.queryWRStandard(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/deliveryOrderDetail")
+    @ResponseBody
+    @ApiOperation("内部订单查询--> 交收委托查询 --> 交收委托详情 ")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public AjaxResult<DeliveryOrderDetailResult> deliveryOrderDetail(String deliveryorderid, String histradedate, HttpServletRequest request) {
+        return iQueryService.deliveryOrderDetail(deliveryorderid, histradedate, request);
+    }
 }

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

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.Date;
 
 

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

@@ -3,12 +3,14 @@ package com.muchinfo.mtp3century.controller;
 import com.muchinfo.mtp3century.service.ITradingAccountService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.entity.Loginaccount;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountAddParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +36,7 @@ public class TradingAccountController {
     @ApiOperation("账号管理-->交易账号管理-->详情")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/view")
-    public AjaxResult<TradingAccountDetailResult> view(Long loginid, HttpServletRequest request) {
+    public AjaxResult<Loginaccount> view(Long loginid, HttpServletRequest request) {
         return iTradingAccountService.view(request, loginid);
     }
 
@@ -48,7 +50,30 @@ public class TradingAccountController {
     @ApiOperation("账号管理-->交易账号管理-->锁定")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/lockAccount")
-    public AjaxResult lockAccount(Long loginid,Integer status, HttpServletRequest request) {
-        return iTradingAccountService.lockAccount(request,status,loginid);
+    public AjaxResult lockAccount(Long loginid, Integer status, HttpServletRequest request) {
+        return iTradingAccountService.lockAccount(request, status, loginid);
     }
+
+    @ApiOperation("账号管理-->交易账号管理-->注销")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/delAccount")
+    public AjaxResult delAccount(Long loginid, HttpServletRequest request) {
+        return iTradingAccountService.delAccount(request, loginid);
+    }
+
+    @ApiOperation("账号管理-->交易账号管理-->恢复")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/undelAccount")
+    public AjaxResult undelAccount(Long loginid, HttpServletRequest request) {
+        return iTradingAccountService.undelAccount(request, loginid);
+    }
+
+    @ApiOperation("账号管理-->交易账号管理-->新增")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.POST, value = "/add")
+    public AjaxResult add(@RequestBody TradingAccountAddParam param, HttpServletRequest request) {
+        return iTradingAccountService.add(request, param);
+    }
+
+
 }

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

@@ -29,7 +29,7 @@ public interface ICommonService {
 
     AjaxResult<TAAccountChildrenResult> queryTAAccountChildren(String accountName, Long areaUserId, HttpServletRequest request);
 
-    AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request);
+    AjaxResult<GoodsSelectResult> queryGoodsSelect(GoodsSelectParam param, HttpServletRequest request);
 
     AjaxResult<Market> getOrderListAll(List<Long> markets, HttpServletRequest request);
 
@@ -60,4 +60,6 @@ public interface ICommonService {
     boolean checkTaaccountReport(Systemmanager systemmanager, Long accountid);
 
     boolean checkLoginAccountRole(Systemmanager systemmanager, Long loginid);
+
+    void sendMsg(Loginaccount la, int type);
 }

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

@@ -23,5 +23,5 @@ public interface IDealLoginService {
 
     AjaxResult restoreAccount(Long loginid, HttpServletRequest request);
 
-    AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, Integer authtype, HttpServletRequest request);
+    AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, HttpServletRequest request);
 }

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

@@ -11,11 +11,14 @@ import com.muchinfo.mtp3pojos.vo.query.commission.CommissionSheetResultDetail;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetParam;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResult;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResultDetail;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.*;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.position.*;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryParam;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.warehouse.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -72,4 +75,14 @@ public interface IQueryService {
     AjaxResult queryGoodsTradeExport(GoodsTradeQueryParam param, HttpServletRequest request);
 
     AjaxResult<OrganSelectResult> summaryQueryInit(HttpServletRequest request);
+
+    PageResult<TradeSumQueryResult> queryTradeSum(TradeSumQueryParam param, HttpServletRequest request);
+
+    AjaxResult exportTradeSum(TradeSumQueryParam param, HttpServletRequest request);
+
+    PageResult<DeliveryOrderEntrustResult> queryDeliveryOrder(DeliveryOrderEntrustParam param, HttpServletRequest request);
+
+    AjaxResult<DeliveryOrderWrsResult> queryWRStandard(DeliveryOrderWrsParam param, HttpServletRequest request);
+
+    AjaxResult<DeliveryOrderDetailResult> deliveryOrderDetail(String deliveryorderid, String histradedate, HttpServletRequest request);
 }

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

@@ -2,7 +2,8 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.entity.Loginaccount;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountAddParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
 
@@ -11,9 +12,15 @@ import javax.servlet.http.HttpServletRequest;
 public interface ITradingAccountService {
     PageResult<TradingAccountQueryResult> query(HttpServletRequest request, TradingAccountQueryParam param);
 
-    AjaxResult<TradingAccountDetailResult> view(HttpServletRequest request, Long loginid);
+    AjaxResult<Loginaccount> view(HttpServletRequest request, Long loginid);
 
     AjaxResult resetPwd(HttpServletRequest request, Long loginid);
 
     AjaxResult lockAccount(HttpServletRequest request, Integer status, Long loginid);
+
+    AjaxResult delAccount(HttpServletRequest request, Long loginid);
+
+    AjaxResult undelAccount(HttpServletRequest request, Long loginid);
+
+    AjaxResult add(HttpServletRequest request, TradingAccountAddParam param);
 }

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

@@ -7,6 +7,7 @@ import com.muchinfo.mtp.proto.AkernelMI1;
 import com.muchinfo.mtp.proto.Common;
 import com.muchinfo.mtp.proto.QuoteMI1;
 import com.muchinfo.mtp3century.service.ICommonService;
+import com.muchinfo.mtp3century.service.ISendMsgService;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
 import com.muchinfo.mtp3common.enumtype.*;
 import com.muchinfo.mtp3common.vo.AjaxResult;
@@ -80,7 +81,8 @@ public class CommonServiceImpl implements ICommonService {
     private RabbitTemplate rabbitTemplate;
     @Resource
     private ILoginaccountMapper iLoginaccountMapper;
-
+    @Resource
+    private ISendMsgService iSendMsgService;
 
     /**
      * 获取当前登入用户loginCode
@@ -204,12 +206,12 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request) {
+    public AjaxResult<GoodsSelectResult> queryGoodsSelect(GoodsSelectParam param, HttpServletRequest request) {
         String[] split = new String[0];
-        if (StringUtils.isNotBlank(goodsStatusIds)) {
-            split = goodsStatusIds.split(",");
+        if (StringUtils.isNotBlank(param.getGoodsStatusIds())) {
+            split = param.getGoodsStatusIds().split(",");
         }
-        List<GoodsSelectResult> goodsSelectResults = iGoodsMapper.queryGoodsSelect(split, marketId, searchCode);
+        List<GoodsSelectResult> goodsSelectResults = iGoodsMapper.queryGoodsSelect(split, param);
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), goodsSelectResults);
     }
 
@@ -517,4 +519,27 @@ public class CommonServiceImpl implements ICommonService {
         commonResult.setTradedate(mr.getTradedate());
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), commonResult);
     }
+
+    @Override
+    public void sendMsg(Loginaccount la, int type) {
+        Set<Long> logins = new HashSet<>();
+        logins.add(la.getLoginid());
+
+        // 0 新增帐号 1 删除帐号  2 修改帐号 3 修改帐号个性化 4 修改账户权限 5 删除三方登陆信息
+        Thread myThread = new Thread(new Runnable() {
+            public void run() {
+                try {
+                    // 使用线程发送消息  延迟5秒发送, 避免数据库未写入
+                    Thread.sleep(5000);
+
+                    iSendMsgService.sendLoginMsg(logins, type, 0);
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+        });
+
+        // 启动线程
+        myThread.start();
+    }
 }

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

@@ -109,7 +109,7 @@ public class DealLoginServiceImpl implements IDealLoginService {
         }
         dealPwd(loginid, redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "046"), systemmanager, la);
         //发送消息
-        sendMsg(la, 2);
+        iCommonService.sendMsg(la, 2);
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
@@ -204,7 +204,7 @@ public class DealLoginServiceImpl implements IDealLoginService {
         // 删除”LoginTAAccount”表相关记录
         iLogintaaccountMapper.delete(new QueryWrapper<Logintaaccount>().eq("loginid", loginid));
         //发送消息
-        sendMsg(la, 1);
+        iCommonService.sendMsg(la, 1);
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
@@ -249,7 +249,7 @@ public class DealLoginServiceImpl implements IDealLoginService {
     }
 
     @Override
-    public AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, Integer authtype, HttpServletRequest request) {
+    public AjaxResult<Userauthinfo> queryUserAuthInfo(Long loginid, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         Userauthinfo userAuthInfo = iUserauthinfoMapper.selectOne(new QueryWrapper<Userauthinfo>()
                 .eq("authtype", 3)
@@ -277,27 +277,6 @@ public class DealLoginServiceImpl implements IDealLoginService {
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), userAuthInfo);
     }
 
-    private void sendMsg(Loginaccount la, int type) {
-        Set<Long> logins = new HashSet<>();
-        logins.add(la.getLoginid());
-
-        // 0 新增帐号 1 删除帐号  2 修改帐号 3 修改帐号个性化 4 修改账户权限 5 删除三方登陆信息
-        Thread myThread = new Thread(new Runnable() {
-            public void run() {
-                try {
-                    // 使用线程发送消息  延迟5秒发送, 避免数据库未写入
-                    Thread.sleep(5000);
-
-                    iSendMsgService.sendLoginMsg(logins, type, 0);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        });
-
-        // 启动线程
-        myThread.start();
-    }
 
     private void dealPwd(Long accountid, String password, Systemmanager user, Loginaccount la) {
 

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

@@ -27,11 +27,14 @@ import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQuer
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.commission.*;
 import com.muchinfo.mtp3pojos.vo.query.contract.*;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.*;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.position.*;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryParam;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.warehouse.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +89,8 @@ public class QueryServiceImpl implements IQueryService {
     private IWrtradeTradedetailMapper iWrtradeTradedetailMapper;
     @Resource
     private IWarehouseinfoMapper iWarehouseinfoMapper;
-
+    @Resource
+    private IWrfactortypeitemMapper iWrfactortypeitemMapper;
 
     @Override
     public PageResult<CommissionSheetResult> commissionSheetQuery(CommissionSheetParam commissionSheetParam, HttpServletRequest request) {
@@ -1044,6 +1048,67 @@ public class QueryServiceImpl implements IQueryService {
         return iCommonService.queryOrganSelect(vo, request);
     }
 
+    @Override
+    public PageResult<TradeSumQueryResult> queryTradeSum(TradeSumQueryParam param, HttpServletRequest request) {
+        IPage<TradeSumQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<TradeSumQueryResult> resultIPage =  iTradeOrderdetailMapper.queryTradeSum(page,param);
+        PageResult<TradeSumQueryResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult exportTradeSum(TradeSumQueryParam param, HttpServletRequest request) {
+        try {
+            List<TradeSumQueryResult> results = iTradeOrderdetailMapper.queryTradeSum(param);;
+            String fileName = "成交汇总_" + DateTimeUtils.getDateTime("yyyyMMdd");
+            if (CollectionUtils.isEmpty(results)) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_005.getCode(), request.getHeader("Accept-Language"));
+            }
+            ExportResult exportResult = ExportUtil.write(fileName, TradeSumQueryResult.class, results);
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
+        } catch (Exception e) {
+            log.error("商品成交汇总导出失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
+    @Override
+    public PageResult<DeliveryOrderEntrustResult> queryDeliveryOrder(DeliveryOrderEntrustParam param, HttpServletRequest request) {
+        IPage<DeliveryOrderEntrustResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<DeliveryOrderEntrustResult> resultIPage = iTradeOrderdetailMapper.queryDeliveryOrder(page,param);
+        PageResult<DeliveryOrderEntrustResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultIPage.getPages());
+        pageResult.setCurrent(resultIPage.getCurrent());
+        pageResult.setTotal(resultIPage.getTotal());
+        pageResult.setPageSize(resultIPage.getSize());
+        pageResult.setData(resultIPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult<DeliveryOrderWrsResult> queryWRStandard(DeliveryOrderWrsParam param, HttpServletRequest request) {
+        param.setIsvalid(1);
+        List<DeliveryOrderWrsResult> results =  iWrstandardMapper.queryWRStandard(param);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), results);
+    }
+
+    @Override
+    public AjaxResult<DeliveryOrderDetailResult> deliveryOrderDetail(String deliveryorderid, String histradedate, HttpServletRequest request) {
+        DeliveryOrderDetailResult deliveryOrderParam = iTradeOrderdetailMapper.queryDeliveryOrderById(deliveryorderid,histradedate);
+        List<Wrfactortypeitem> list =  iTradeOrderdetailMapper.queryWRFactorTypeItemNew(deliveryOrderParam.getWrfactortypeid());
+        deliveryOrderParam.setWrFactorTypeItemList(list);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), deliveryOrderParam);
+    }
+
     private void getPerformanceTemplateById(WarehouseCommissionResultDetail dto) {
         Performanceplantemplate plantemplate = iPerformanceplantemplateMapper.selectOne(
                 new QueryWrapper<Performanceplantemplate>().eq("autoid", dto.getWrTradeOrderDetail().getPerformancetemplateid()));

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

@@ -91,12 +91,12 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
     public PageResult<TaAccountQueryResult> queryUserMsg(HttpServletRequest request, TaAccountQueryParam taAccountQueryParam) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         Arearole ar = iArearoleMapper.selectOne(new QueryWrapper<Arearole>()
-                .eq("userid",systemmanager.getAreauserid())
-                .eq("roletype",6));
+                .eq("userid", systemmanager.getAreauserid())
+                .eq("roletype", 6));
         taAccountQueryParam.setUserId(systemmanager.getAreauserid());
         IPage<TaAccountQueryResult> page = new Page<>(taAccountQueryParam.getPageNum(), taAccountQueryParam.getPageSize());
         IPage<TaAccountQueryResult> queryResultIPage = iTaaccountMapper.queryTaAccountPage(page, taAccountQueryParam);
-        queryResultIPage.getRecords().forEach(a->{
+        queryResultIPage.getRecords().forEach(a -> {
             if (Objects.nonNull(ar)) {
                 a.setSelfsupport(1);
             }
@@ -409,28 +409,37 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
     @Override
     public PageResult<Taaccount> showAccount(Long userid, String accountid, Integer pageNo, Integer pageSize, HttpServletRequest request) {
         QueryWrapper<Taaccount> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("accountid", accountid);
+        if (StringUtils.isNotBlank(accountid)) {
+            queryWrapper.eq("accountid", accountid);
+        }
         if (userid != null) {
             queryWrapper.and(w -> w.eq("userid", userid).eq("ismain", 1)
                     .or()
                     .eq("userid", userid).eq("relateduserid", 1));
         }
-        IPage<Taaccount> page = new Page<>(pageNo, pageSize);
-        IPage<Taaccount> taaccountIPage = iTaaccountMapper.selectPage(page, queryWrapper);
-        //处理金额
-        taaccountIPage.getRecords().forEach(a -> {
-            dealAmount(a);
-            a.setAccountname(iUseraccountMapper.selectOrganName(a.getUserid()));
-        });
         //返回列表
         PageResult<Taaccount> pageResult = new PageResult<>();
-        pageResult.setCode(Constants.Success_Code_Design);
-        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
-        pageResult.setPages(taaccountIPage.getPages());
-        pageResult.setCurrent(taaccountIPage.getCurrent());
-        pageResult.setTotal(taaccountIPage.getTotal());
-        pageResult.setPageSize(taaccountIPage.getSize());
-        pageResult.setData(taaccountIPage.getRecords());
+        if (pageNo == null) {
+            List<Taaccount> taaccountList = iTaaccountMapper.selectList(queryWrapper);
+            pageResult.setCode(Constants.Success_Code_Design);
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+            pageResult.setData(taaccountList);
+        } else {
+            IPage<Taaccount> page = new Page<>(pageNo, pageSize);
+            IPage<Taaccount> taaccountIPage = iTaaccountMapper.selectPage(page, queryWrapper);
+            //处理金额
+            taaccountIPage.getRecords().forEach(a -> {
+                dealAmount(a);
+                a.setAccountname(iUseraccountMapper.selectOrganName(a.getUserid()));
+            });
+            pageResult.setCode(Constants.Success_Code_Design);
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+            pageResult.setPages(taaccountIPage.getPages());
+            pageResult.setCurrent(taaccountIPage.getCurrent());
+            pageResult.setTotal(taaccountIPage.getTotal());
+            pageResult.setPageSize(taaccountIPage.getSize());
+            pageResult.setData(taaccountIPage.getRecords());
+        }
         return pageResult;
     }
 
@@ -452,7 +461,7 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
             old.setTradestatus(updateParam.getTradestatus());
             old.setChangetime(new Date());
         }
-        iTaaccountMapper.updateById(old);
+        iTaaccountMapper.update(old, new QueryWrapper<Taaccount>().eq("accountid", old.getAccountid()));
 
         try {
             //发送用户变更通知

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muchinfo.mtp.proto.Common;
 import com.muchinfo.mtp.proto.SystemMI1;
 import com.muchinfo.mtp3century.service.ICommonService;
-import com.muchinfo.mtp3century.service.ISystemmanagerService;
 import com.muchinfo.mtp3century.service.ITradingAccountService;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.FunCodeConstants;
@@ -23,7 +22,7 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3interface.mapper.*;
 import com.muchinfo.mtp3pojos.entity.*;
 import com.muchinfo.mtp3pojos.vo.ProtoErrorCodes;
-import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountDetailResult;
+import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountAddParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryParam;
 import com.muchinfo.mtp3pojos.vo.tradingacc.TradingAccountQueryResult;
 import org.slf4j.Logger;
@@ -65,13 +64,16 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
     private RabbitTemplate rabbitTemplate;
     @Resource
     private SystemmanagerServiceImpl systemmanagerService;
+    @Resource
+    private IUserauthinfoMapper iUserauthinfoMapper;
+
     @Override
     public PageResult<TradingAccountQueryResult> query(HttpServletRequest request, TradingAccountQueryParam param) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         param.setUserid(systemmanager.getAreauserid());
         param.setLoginusertype(2);
         IPage<TradingAccountQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
-        IPage<TradingAccountQueryResult> userAccountVos = iLoginaccountMapper.queryTradingAccount(page,param);
+        IPage<TradingAccountQueryResult> userAccountVos = iLoginaccountMapper.queryTradingAccount(page, param);
         PageResult<TradingAccountQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
@@ -84,14 +86,14 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
     }
 
     @Override
-    public AjaxResult<TradingAccountDetailResult> view(HttpServletRequest request, Long loginid) {
+    public AjaxResult<Loginaccount> view(HttpServletRequest request, Long loginid) {
         Loginaccount loginaccount = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
         List<Logintaaccount> list = iLogintaaccountMapper.selectList(new QueryWrapper<Logintaaccount>().eq("loginid", loginid));
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             List<Taaccount> tas = iTaaccountMapper.selectList(new QueryWrapper<Taaccount>().eq("userid", loginaccount.getUserid()));
             List<Long> ids = tas.stream().map(Taaccount::getAccountid).collect(Collectors.toList());
             loginaccount.setAccountIdS(ids);
-        }else {
+        } else {
             List<Long> ids = list.stream().map(Logintaaccount::getAccountid).collect(Collectors.toList());
             loginaccount.setAccountIdS(ids);
         }
@@ -101,23 +103,23 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
     @Override
     public AjaxResult resetPwd(HttpServletRequest request, Long loginid) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        if(!iCommonService.checkLoginAccountRole(systemmanager,loginid)){
+        if (!iCommonService.checkLoginAccountRole(systemmanager, loginid)) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
         }
-        String password = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM,"046");
+        String password = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, "046");
         Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
-        if(la != null){
+        if (la != null) {
             la.setHasupdatedpwd(0);
-            la.setPassword(EncryptionUtils.encryptSHA(la.getLoginid()+password));
+            la.setPassword(EncryptionUtils.encryptSHA(la.getLoginid() + password));
             la.setModifierid(systemmanager.getAutoid());
             la.setModifytime(new Date());
 
-            iLoginaccountMapper.update(new QueryWrapper<Loginaccount>().eq("LOGINID",la.getLoginid()));
+            iLoginaccountMapper.update(new QueryWrapper<Loginaccount>().eq("LOGINID", la.getLoginid()));
             writelog(la, systemmanager, SysConstants.BUTTON_CODE_RESET);
 
             //重置密码短信消息
-            Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid",la.getUserid()));
-            if(StringUtils.isNotBlank(ui.getMobile())){
+            Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", la.getUserid()));
+            if (StringUtils.isNotBlank(ui.getMobile())) {
                 List<String> strs = new ArrayList<String>();
                 strs.add(ui.getCustomername());
                 strs.add(loginid.toString());
@@ -134,7 +136,7 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
     public AjaxResult lockAccount(HttpServletRequest request, Integer status, Long loginid) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
-        if(la != null){
+        if (la != null) {
             // 发送消息 解锁 ,回应
             Long uuid = SerialNumberUtils.getNewSerialNumber(SerialNumberUtils.prefix_account);
 
@@ -149,38 +151,38 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
             builder.setLoginStatus(status);
             builder.setOperatorID(systemmanager.getAutoid().intValue());
 
-            log.info("手工锁定：{}",builder.build().toString());
+            log.info("手工锁定：{}", builder.build().toString());
             byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(),
                     FunCodeConstants.FunCode_LoginStatusOperReq);
 
             Calculator ca = new Calculator(uuid);
             SerialNumberUtils.lockMap.put(uuid, ca);
 
-            rabbitTemplate.send(SysConstants.RabbitUserNtfKey,new Message(body, new MessageProperties()));
+            rabbitTemplate.send(SysConstants.RabbitUserNtfKey, new Message(body, new MessageProperties()));
 
-            if (status == 1){
+            if (status == 1) {
                 systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MANAGE, String.format("解锁登录账户(loginid=%s)成功", loginid), systemmanager, null, null, null);
-            }else if (status == 2){
+            } else if (status == 2) {
                 systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MANAGE, String.format("锁定登录账户(loginid=%s)成功", loginid), systemmanager, null, null, null);
             }
 
-            synchronized(ca){
+            synchronized (ca) {
                 try {
                     ca.wait(10000);
                     Object rsp = ca.obj;
-                    if(rsp!=null){
+                    if (rsp != null) {
                         SystemMI1.LoginStatusOperRsp rsp_ = (SystemMI1.LoginStatusOperRsp) rsp;
-                        if(rsp_.getRetCode()==0){
+                        if (rsp_.getRetCode() == 0) {
                             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
-                        }else{
+                        } else {
                             return AjaxResult.error(Constants.Error_Code_Design, ProtoErrorCodes.resultMsg(rsp_.getRetCode()), "");
                         }
-                    }else{
+                    } else {
                         return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM006.getCode(), request.getHeader("Accept-Language"));
                     }
                 } catch (InterruptedException e) {
                     log.error("收取锁定交易账号通知失败，失败原因：" + e.getMessage());
-                }finally {
+                } finally {
                     SerialNumberUtils.lockMap.remove(uuid);
                 }
             }
@@ -188,8 +190,76 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
         return null;
     }
 
-    private void writelog(Loginaccount la, Systemmanager opeartion, String button_code){
-        try{
+    @Override
+    public AjaxResult delAccount(HttpServletRequest request, Long loginid) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (!iCommonService.checkLoginAccountRole(systemmanager, loginid)) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
+        }
+
+        //同时 删除三方账户
+        Userauthinfo userauthinfo = iUserauthinfoMapper.selectOne(new QueryWrapper<Userauthinfo>().eq("loginid", loginid));
+        if (Objects.nonNull(userauthinfo)) {
+            userauthinfo.setIsvalid(0);
+            iUserauthinfoMapper.update(userauthinfo, new QueryWrapper<Userauthinfo>().eq("loginid", loginid));
+        }
+        // 删除”LoginTAAccount”表相关记录
+        iLogintaaccountMapper.delete(new QueryWrapper<Logintaaccount>().eq("loginid", loginid));
+
+        Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+        if (Objects.nonNull(la)) {
+            la.setLoginstatus(3);
+            la.setModifierid(systemmanager.getAutoid());
+            la.setModifytime(new Date());
+            iLoginaccountMapper.update(la, new QueryWrapper<Loginaccount>().eq("loginid", la.getLoginid()));
+
+            writelog(la, systemmanager, SysConstants.BUTTON_CODE_DEL);
+
+            iCommonService.sendMsg(la, 1);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult undelAccount(HttpServletRequest request, Long loginid) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (!iCommonService.checkLoginAccountRole(systemmanager, loginid)) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
+        }
+        Loginaccount la = iLoginaccountMapper.selectOne(new QueryWrapper<Loginaccount>().eq("loginid", loginid));
+        if (Objects.nonNull(la)) {
+            la.setLoginstatus(1);
+            la.setModifierid(systemmanager.getAutoid());
+            la.setModifytime(new Date());
+            iLoginaccountMapper.update(la, new QueryWrapper<Loginaccount>().eq("loginid", la.getLoginid()));
+
+            writelog(la, systemmanager, SysConstants.BUTTON_CODE_ACTIVE);
+
+            iCommonService.sendMsg(la, 0);
+        }
+
+        //同时 恢复手机号登录 20240417
+        bindUserMobielToLoginID(la.getUserid(), la.getLoginid());
+        //同时 恢复三方账户
+        Userauthinfo userauthinfo = iUserauthinfoMapper.selectOne(new QueryWrapper<Userauthinfo>().eq("loginid", loginid));
+        if (Objects.nonNull(userauthinfo)) {
+            userauthinfo.setIsvalid(1);
+            iUserauthinfoMapper.update(userauthinfo, new QueryWrapper<Userauthinfo>().eq("loginid", loginid));
+        }
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult add(HttpServletRequest request, TradingAccountAddParam param) {
+
+
+
+        return null;
+    }
+
+    private void writelog(Loginaccount la, Systemmanager opeartion, String button_code) {
+        try {
             Systemmanagerlog log = new Systemmanagerlog();
             log.setUserid(opeartion.getAutoid());
             log.setReletype(opeartion.getReletype());
@@ -198,42 +268,60 @@ public class TradingAccountServiceImpl implements ITradingAccountService {
             log.setParentuserid(opeartion.getAreauserid());
             log.setOperatetime(new Date());
             log.setIp(opeartion.getLoginip());
-            if(la.getLoginusertype() == 1){
+            if (la.getLoginusertype() == 1) {
                 log.setResourcecode(SysConstants.PART_INVESTOR_MANAGE);
-                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE",SysConstants.PART_INVESTOR_MANAGE));
-                if(menu != null)
+                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE", SysConstants.PART_INVESTOR_MANAGE));
+                if (menu != null)
                     log.setResourcename(menu.getResourcename());
                 else
                     log.setResourcename("交易商管理");
-                if(button_code.equals(SysConstants.BUTTON_CODE_DEL))
-                    log.setContent("注销交易商登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
-                    log.setContent("恢复交易商登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_ADD))
-                    log.setContent("新增交易商登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_RESET))
-                    log.setContent("重置交易商登录账户(loginid="+ la.getLoginid() +")密码成功");
-            }else{
+                if (button_code.equals(SysConstants.BUTTON_CODE_DEL))
+                    log.setContent("注销交易商登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
+                    log.setContent("恢复交易商登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_ADD))
+                    log.setContent("新增交易商登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_RESET))
+                    log.setContent("重置交易商登录账户(loginid=" + la.getLoginid() + ")密码成功");
+            } else {
                 log.setResourcecode(SysConstants.OPERATION_LOGIN);
-                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE",SysConstants.PART_INVESTOR_MANAGE));
-                if(menu != null)
+                Funcmenulist menu = iFuncmenulistMapper.selectOne(new QueryWrapper<Funcmenulist>().eq("RESOURCECODE", SysConstants.PART_INVESTOR_MANAGE));
+                if (menu != null)
                     log.setResourcename(menu.getResourcename());
                 else
                     log.setResourcename("自营登录账户管理");
-                if(button_code.equals(SysConstants.BUTTON_CODE_DEL))
-                    log.setContent("注销自营登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
-                    log.setContent("恢复自营登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_ADD))
-                    log.setContent("新增自营登录账户(loginid="+ la.getLoginid() +")成功");
-                if(button_code.equals(SysConstants.BUTTON_CODE_RESET))
-                    log.setContent("重置自营登录账户(loginid="+ la.getLoginid() +")密码成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_DEL))
+                    log.setContent("注销自营登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_ACTIVE))
+                    log.setContent("恢复自营登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_ADD))
+                    log.setContent("新增自营登录账户(loginid=" + la.getLoginid() + ")成功");
+                if (button_code.equals(SysConstants.BUTTON_CODE_RESET))
+                    log.setContent("重置自营登录账户(loginid=" + la.getLoginid() + ")密码成功");
             }
             log.setOldvalue("");
             log.setNewvalue("");
             iSystemmanagerlogMapper.insert(log);
-        }catch(Exception e){
-            log.error("插入操作日志失败，失败原因："+e.getMessage());
+        } catch (Exception e) {
+            log.error("插入操作日志失败，失败原因：" + e.getMessage());
+        }
+    }
+
+    public void bindUserMobielToLoginID(Long userID, Long loginID) {
+        Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", userID));
+        if (Objects.nonNull(ui) && StringUtils.isNotBlank(ui.getMobile())) {
+            Userauthinfo userAuthInfo = iUserauthinfoMapper.selectOne(new QueryWrapper<Userauthinfo>()
+                    .eq("authtype", 3)
+                    .eq("authid", ui.getMobile()));
+            if (userAuthInfo == null) {
+                Userauthinfo newObj = new Userauthinfo();
+                newObj.setAuthid(ui.getMobile());
+                newObj.setAuthtype(3);
+                newObj.setLoginid(loginID);
+                newObj.setUserid(userID);
+                newObj.setIsvalid(1);
+                iUserauthinfoMapper.insert(newObj);
+            }
         }
     }
 }

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

@@ -293,30 +293,34 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     .eq("goodsid", goodsid));
             TodayAccounttraderule tr = iTodayAccounttraderuleMapper.selectOne(new QueryWrapper<TodayAccounttraderule>()
                     .eq("accountid", accountid)
-                    .eq("goodsid", goodsid));
+                    .eq("goodsid", goodsid)
+                    .eq("tradetype", 1));
             TodayAccounttradefee tf = iTodayAccounttradefeeMapper.selectOne(new QueryWrapper<TodayAccounttradefee>()
                     .eq("accountid", accountid)
-                    .eq("goodsid", goodsid));
+                    .eq("goodsid", goodsid)
+                    .eq("tradetype", 1));
             //当没有个性化，查询账户id=0的即商品默认的配置
             if (Objects.isNull(mr)) {
                 mr = iTodayAccountmarginMapper.selectOne(new QueryWrapper<TodayAccountmargin>()
-                        .eq("accountid", accountid)
-                        .eq("goodsid", 0L));
+                        .eq("accountid", 0L)
+                        .eq("goodsid", goodsid));
             }
             if (Objects.isNull(tr)) {
                 tr = iTodayAccounttraderuleMapper.selectOne(new QueryWrapper<TodayAccounttraderule>()
-                        .eq("accountid", accountid)
-                        .eq("goodsid", 0L));
+                        .eq("accountid", 0L)
+                        .eq("goodsid", goodsid)
+                        .eq("tradetype", 1));
             }
             if (Objects.isNull(tf)) {
                 tf = iTodayAccounttradefeeMapper.selectOne(new QueryWrapper<TodayAccounttradefee>()
-                        .eq("accountid", accountid)
-                        .eq("goodsid", 0L));
+                        .eq("accountid", 0L)
+                        .eq("goodsid", goodsid)
+                        .eq("tradetype", 1));
             }
             List<Long> id_list = new ArrayList<Long>();
             if (mr != null) {
                 ServiceMemoryCache.MarginInfoStruct marginInfo = ServiceMemoryCache.MarginInfoStruct.newBuilder().
-                        mergeFrom((Message) mr.getInfocontent()).build();
+                        mergeFrom(mr.getInfocontent()).build();
                 result.setMarginalgorithm(marginInfo.getMarginAlgorithm());
                 result.setLockmarginvalue(marginInfo.getLockMarginValue());
                 result.setMarketmarginvalue(marginInfo.getMarketMarginValue());
@@ -324,7 +328,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             }
             if (tr != null) {
                 ServiceMemoryCache.TradeRuleInfoStruct traderuleinfo = ServiceMemoryCache.TradeRuleInfoStruct.newBuilder().
-                        mergeFrom((Message) tr.getInfocontent()).build();
+                        mergeFrom(tr.getInfocontent()).build();
 
                 List<ServiceMemoryCache.TradeRule> ruleList = traderuleinfo.getTradeRulesList();
                 Map<Integer, Object> temp = new HashMap<Integer, Object>();
@@ -348,7 +352,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             }
             if (tf != null) {
                 ServiceMemoryCache.TradeFeeInfoStruct tradefeeinfo = ServiceMemoryCache.TradeFeeInfoStruct.newBuilder().
-                        mergeFrom((Message) tf.getInfocontent()).build();
+                        mergeFrom(tf.getInfocontent()).build();
                 List<InvestorExtendFee> feeStruct = new ArrayList<>();
 
                 Map<Integer, ServiceMemoryCache.TradeFee> ftemp = new HashMap<Integer, ServiceMemoryCache.TradeFee>();
@@ -370,8 +374,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     extendFee.setFeeid(p.getTradefeeid());
                     extendFee.setFeename(p.getTradefeename());
                     extendFee.setFeealgorithm(ftemp.get(p.getTradefeeid()).getFeeAlgorithm());
-                    extendFee.setExchangevalue(ftemp.get(p.getTradefeeid()).getExchangeValue());
-                    extendFee.setMemberdefaultvalue(ftemp.get(p.getTradefeeid()).getMemberDefaultValue());
+                    if (extendFee.getFeealgorithm() == 1) {
+                        extendFee.setMemberdefaultvalue(ftemp.get(p.getTradefeeid()).getMemberDefaultValue() * 10000);
+                        extendFee.setExchangevalue(ftemp.get(p.getTradefeeid()).getExchangeValue() * 10000);
+                    } else {
+                        extendFee.setMemberdefaultvalue(ftemp.get(p.getTradefeeid()).getMemberDefaultValue());
+                        extendFee.setExchangevalue(ftemp.get(p.getTradefeeid()).getExchangeValue());
+                    }
+
                     feeStruct.add(extendFee);
                 });
                 result.setExtendFee(feeStruct);
@@ -556,8 +566,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 //sendMsgService.sendSMSConnetion(templateId, recPhone, params);
             } else {
                 boolean isSend = false;
-                dua.setModifystatus(1);
-                iDraftUseraccountNewMapper.updateById(dua);
+                iDraftUseraccountNewMapper.deleteById(dua);
+                iDraftUserinfoMapper.delete(new QueryWrapper<DraftUserinfo>().eq("USERID", dua.getUserid()));
 
                 ua.setModifystatus(6);
                 ua.setAudittime(new Date());
@@ -615,8 +625,9 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 iDraftUseraccountNewMapper.updateById(dua);
             } else {
                 boolean isSend = false;
-                dua.setModifystatus(1);
-                iDraftUseraccountNewMapper.updateById(dua);
+                iDraftUseraccountNewMapper.deleteById(dua);
+                iDraftUserinfoMapper.delete(new QueryWrapper<DraftUserinfo>().eq("USERID", dua.getUserid()));
+
                 ua.setModifystatus(5);
                 ua.setAudittime(new Date());
                 ua.setAudituserid(systemmanager.getAutoid());
@@ -658,7 +669,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult investorEdit(DetailBeforeResult param, HttpServletRequest request){
+    public AjaxResult investorEdit(DetailBeforeResult param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         if (!iCommonService.checkUserAccountRole(systemmanager, param.getUserAccountDetailVo().getUserId())) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
@@ -1196,9 +1207,9 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             if (marketid == null) {
                 result.setMarkets(iMarketMapper.getNoTradeConfigMarkets(systemmanager.getAreauserid(), usergroupid));
             } else {
-                if(goodsid == null){
+                if (goodsid == null) {
                     result.setGoods(iGoodsMapper.getNoTradeConfigGoods(systemmanager.getAreauserid(), usergroupid, marketid));
-                }else{
+                } else {
                     result.setFeesConfigVos(getTradeFeeDescriptions(marketid, goodsid, systemmanager.getAreauserid()));
                     result.setRulesConfigVos(getTradeRuleDescriptions(marketid, goodsid, systemmanager.getAreauserid()));
                     //客户类别
@@ -1342,8 +1353,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(),param.getUsergroupid());
-        List<FeesConfigVo> feeList = iUseraccountMapper.getTradeFeeDescriptions(param.getMarketid(), param.getGoodsid(), systemmanager.getAreauserid(),param.getUsergroupid());
+        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())) {
@@ -1448,17 +1459,17 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         List<Accounttradeconfig> list = iAccounttradeconfigMapper.getListForTree(systemmanager.getAreauserid());
 
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), new ArrayList<AccountTradeConfigTreeVo>());
         }
 
         //先按类型
         Map<Integer, List<Accounttradeconfig>> type = new HashMap<>();
-        for(Accounttradeconfig fig:list){
+        for (Accounttradeconfig fig : list) {
             Integer key = fig.getTradetype();
-            if(type.containsKey(key)){
+            if (type.containsKey(key)) {
                 type.get(key).add(fig);
-            }else{
+            } else {
                 List<Accounttradeconfig> temp = new ArrayList<>();
                 temp.add(fig);
                 type.put(key, temp);
@@ -1467,14 +1478,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
 
         //用户userid
         Map<Integer, Map<Long, List<Accounttradeconfig>>> users = new HashMap<>();
-        for(Map.Entry<Integer, List<Accounttradeconfig>> entry:type.entrySet()){
+        for (Map.Entry<Integer, List<Accounttradeconfig>> entry : type.entrySet()) {
             Map<Long, List<Accounttradeconfig>> market = new HashMap<>();
             List<Accounttradeconfig> temp = entry.getValue();
-            for(Accounttradeconfig fig:temp){
+            for (Accounttradeconfig fig : temp) {
                 Long key = fig.getUserid();
-                if(market.containsKey(key)){
+                if (market.containsKey(key)) {
                     market.get(key).add(fig);
-                }else{
+                } else {
                     List<Accounttradeconfig> _temp = new ArrayList<>();
                     _temp.add(fig);
                     market.put(key, _temp);
@@ -1485,18 +1496,18 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
 
         //资金账户
         Map<Integer, Map<Long, Map<Long, List<Accounttradeconfig>>>> user = new HashMap<>();
-        for(Map.Entry<Integer, Map<Long, List<Accounttradeconfig>>> entry:users.entrySet()){
+        for (Map.Entry<Integer, Map<Long, List<Accounttradeconfig>>> entry : users.entrySet()) {
             Map<Long, Map<Long, List<Accounttradeconfig>>> u = new HashMap<>();
 
             Map<Long, List<Accounttradeconfig>> temp = entry.getValue();//userid
-            for(Map.Entry<Long, List<Accounttradeconfig>> entry_:temp.entrySet()){
+            for (Map.Entry<Long, List<Accounttradeconfig>> entry_ : temp.entrySet()) {
                 Map<Long, List<Accounttradeconfig>> market = new HashMap<>();
                 List<Accounttradeconfig> ul = entry_.getValue();//用户下所有的资金
-                for(Accounttradeconfig fig:ul){
+                for (Accounttradeconfig fig : ul) {
                     Long key = fig.getAccountid();
-                    if(market.containsKey(key)){
+                    if (market.containsKey(key)) {
                         market.get(key).add(fig);
-                    }else{
+                    } else {
                         List<Accounttradeconfig> _temp = new ArrayList<>();
                         _temp.add(fig);
                         market.put(key, _temp);
@@ -1510,26 +1521,26 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         Set<String> set = new HashSet<>();
         List<AccountTradeConfigTreeVo> result = new ArrayList<>();
 
-        for(Map.Entry<Integer, Map<Long, Map<Long, List<Accounttradeconfig>>>> entry_:user.entrySet()){
-            for(Map.Entry<Long, Map<Long, List<Accounttradeconfig>>> entry:entry_.getValue().entrySet()){
+        for (Map.Entry<Integer, Map<Long, Map<Long, List<Accounttradeconfig>>>> entry_ : user.entrySet()) {
+            for (Map.Entry<Long, Map<Long, List<Accounttradeconfig>>> entry : entry_.getValue().entrySet()) {
                 Accounttradeconfig base = null;
-                for(Map.Entry<Long, List<Accounttradeconfig>> _entry:entry.getValue().entrySet()){
+                for (Map.Entry<Long, List<Accounttradeconfig>> _entry : entry.getValue().entrySet()) {
                     List<Accounttradeconfig> temp = _entry.getValue();
-                    for(int i=0;i<temp.size();i++ ){
+                    for (int i = 0; i < temp.size(); i++) {
                         Accounttradeconfig fig = temp.get(i);
-                        if(fig.getTradetype()==null){
+                        if (fig.getTradetype() == null) {
                             fig.setTradetype(1);
                         }
-                        if(i==0){
+                        if (i == 0) {
                             base = fig;
                         }
-                        String setKey = fig.getTradetype()+""+fig.getUserid()+""+fig.getAccountid()+""+fig.getGoodsid();
-                        if(!set.contains(setKey)){
+                        String setKey = fig.getTradetype() + "" + fig.getUserid() + "" + fig.getAccountid() + "" + fig.getGoodsid();
+                        if (!set.contains(setKey)) {
                             set.add(setKey);
                             //商品级
                             AccountTradeConfigTreeVo vo2 = new AccountTradeConfigTreeVo();
-                            vo2.setId(fig.getTradetype()+fig.getGoodsid().toString());
-                            vo2.setPid(fig.getTradetype()+fig.getUserid()+""+fig.getAccountid());
+                            vo2.setId(fig.getTradetype() + fig.getGoodsid().toString());
+                            vo2.setPid(fig.getTradetype() + fig.getUserid() + "" + fig.getAccountid());
                             vo2.setLevel(3);
                             vo2.setName(fig.getGoodsname());//商品名称
                             vo2.setUserid(fig.getUserid());
@@ -1542,8 +1553,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     }
                     //资金账户级
                     AccountTradeConfigTreeVo vo1 = new AccountTradeConfigTreeVo();
-                    vo1.setId(base.getTradetype()+base.getUserid()+""+base.getAccountid());
-                    vo1.setPid(base.getTradetype()+"u"+base.getUserid().toString());
+                    vo1.setId(base.getTradetype() + base.getUserid() + "" + base.getAccountid());
+                    vo1.setPid(base.getTradetype() + "u" + base.getUserid().toString());
                     vo1.setLevel(2);
                     vo1.setName(base.getAccountid().toString());//市场名称
                     vo1.setUserid(base.getUserid());
@@ -1553,14 +1564,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 }
                 //用户级
                 AccountTradeConfigTreeVo vo = new AccountTradeConfigTreeVo();
-                vo.setId(base.getTradetype()+"u"+base.getUserid().toString());
-                if(base.getTradetype()==null || base.getTradetype()==0 || base.getTradetype()==1){
+                vo.setId(base.getTradetype() + "u" + base.getUserid().toString());
+                if (base.getTradetype() == null || base.getTradetype() == 0 || base.getTradetype() == 1) {
                     vo.setPid("-1");
-                }else{
+                } else {
                     vo.setPid("-2");
                 }
                 vo.setLevel(1);
-                vo.setName(StringUtils.isBlank(base.getAccountname())?"默认配置":base.getAccountname());//分组名称
+                vo.setName(StringUtils.isBlank(base.getAccountname()) ? "默认配置" : base.getAccountname());//分组名称
                 vo.setUserid(base.getUserid());
                 vo.setTradetype(base.getTradetype());
                 result.add(vo);
@@ -1571,7 +1582,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,null);
+        List<RulesConfigVo> list = iUseraccountMapper.getTradeRuleDescriptions(marketid, goodsid, areauserid, null);
 
         if (list != null && !list.isEmpty()) {
             Object o = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "007");
@@ -1605,7 +1616,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,null);
+        List<FeesConfigVo> list = iUseraccountMapper.getTradeFeeDescriptions(marketid, goodsid, areauserid, null);
         if (CollectionUtils.isNotEmpty(list)) {
             Object o = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "007");
             if (o != null && "1".equals(o.toString())) {
@@ -1643,7 +1654,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                         }
                     }
                 }
-            }else {
+            } else {
                 for (int i = 0; i < list.size(); i++) {
                     if (list.get(i).getFeealgorithm() == 1) {
                         if (list.get(i).getExchangevalue() != null

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

@@ -79,12 +79,15 @@
                     ${item}
                 </foreach>
             </if>
-            <if test="searchCode != null and searchCode != '' ">
+            <if test="vo.searchCode != null and vo.searchCode != '' ">
                 and g.goodscode like
-                '%'||#{searchCode}||'%'
+                '%'||#{vo.searchCode}||'%'
             </if>
-            <if test="marketId != null and marketId != '' ">
-                and g.marketid = #{marketId}
+            <if test="vo.marketId != null and vo.marketId != '' ">
+                and g.marketid = #{vo.marketId}
+            </if>
+            <if test="vo.deliveryflag != null">
+                and g.deliveryflag = #{vo.deliveryflag}
             </if>
         </where>
         and rownum &lt;= 10

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

@@ -52,24 +52,21 @@
 
     <select id="queryLoginAccountPage" resultType="com.muchinfo.mtp3pojos.vo.investor.InvestorLoginQueryResult"
             parameterType="com.muchinfo.mtp3pojos.vo.investor.InvestorLoginQueryParam">
-        select t.loginid ,t.loginstatus ,t.modifytime,s.modifiername
+        select t.loginid ,t.loginstatus ,t.modifytime,s.username as modifiername
         from loginaccount t
         left join systemmanager s on t.modifierid = s.autoid
         <where>
-            <if test="loginusertype != null">
-                and t.loginusertype = #{loginusertype}
-            </if>
-            <if test="loginid !=null">
-                and t.loginid = #{loginid}
+            <if test="vo.loginusertype != null">
+                and t.loginusertype = #{vo.loginusertype}
             </if>
-            <if test="loginstatus != null">
-                and t.loginstatus = #{loginstatus}
+            <if test="vo.loginid !=null">
+                and t.loginid = #{vo.loginid}
             </if>
-            <if test="userid != null">
-                and t.userid = #{userid}
+            <if test="vo.loginstatus != null">
+                and t.loginstatus = #{vo.loginstatus}
             </if>
-            <if test="auth != null and auth !=''">
-                and t.logincode = #{auth}
+            <if test="vo.userid != null">
+                and t.userid = #{vo.userid}
             </if>
         </where>
         order by t.loginstatus,t.loginid

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

@@ -1344,4 +1344,224 @@
         order by t.orderindexid desc, t.orderid desc
     </select>
 
+    <select id="queryTradeSum" parameterType="com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryParam"
+            resultType="com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryResult">
+        SELECT T.tradedate,
+        T.ACCOUNTID,
+        t.tradetype,
+        ua.userid,
+        vlo.LOGINIDS as loginid,
+        T.GOODSID,
+        t.buyorsell,
+        sum(t.tradeqty) as tradeqty,
+        sum(t.tradeamount) as tradeamount,
+        sum(t.opencharge + t.closecharge) as totalcharge,
+        case
+        when sum(t.tradeqty) = 0 then
+        0
+        else
+        ROUND(sum(t.tradeamount) / sum(t.tradeqty * g.agreeunit), g.decimalplace)
+        end "tradepriceavg",
+        ua.accountname as currentname,
+        pua.accountname as parentusername,
+        g.goodscode,
+        g.goodsname,
+        en.enumdicname as buyorselldisplay
+        FROM his_trade_tradedetail T
+        left join goods g
+        on g.goodsid = t.goodsid
+        left join taaccount ta
+        on ta.accountid = t.accountid
+        left join useraccount ua
+        on ta.userid = ua.userid
+        left join useraccount pua
+        on pua.userid = ua.parentuserid
+        left join enumdicitem en
+        on en.enumdiccode = 'buyOrSell'
+        and en.enumitemname = t.buyorsell
+        left join view_user_loginids vlo
+        on vlo.USERID = ta.userid
+        <where>
+            t.isvaliddata = 1
+            <if test="vo.cycletime != null and vo.cycletime !=''">
+                and t.tradedate =#{vo.cycletime}
+            </if>
+            <if test="vo.goodsid != null">
+                and t.goodsid=#{vo.goodsid}
+            </if>
+            <if test="vo.buyorsell != null">
+                and t.buyorsell=#{vo.buyorsell}
+            </if>
+            <if test="vo.tradetypes != null and vo.tradetypes !=''">
+                and t.tradetype in (${vo.tradetypes})
+            </if>
+            <if test="vo.loginid != null and vo.loginid !=''">
+                and vlo.LOGINIDS = #{vo.loginid}
+            </if>
+        </where>
+        group by T.tradedate,
+        T.ACCOUNTID,
+        T.GOODSID,
+        t.tradetype,
+        ua.userid,
+        t.buyorsell,
+        g.decimalplace,
+        ua.accountname,
+        pua.accountname,
+        g.goodscode,
+        g.goodsname,
+        en.enumdicname,
+        vlo.LOGINIDS
+        order by t.tradedate desc
+    </select>
+
+    <select id="queryDeliveryOrder" parameterType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderEntrustParam"
+            resultType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderEntrustResult">
+        select
+        <choose>
+            <when test="vo.ishis == 1">
+                d.histradedate,
+            </when>
+        </choose>
+        d.deliveryorderid, d.deliveryticket, d.accountid,u.accountname,d.matchaccountid,
+        d.xgoodsid, d.xdeliveryqty, d.pgoodsid,
+        d.pdeliveryqty, d.deliverygoodsid, d.deliveryqty,
+        d.deliveryorderstatus, d.ordertime,
+        g1.goodsname as xgoodsname,
+        g2.goodsname as pgoodsname,
+        dg.deliverygoodsname,
+        wr.wrstandardid, wr.wrstandardcode, wr.wrstandardname, dic.enumdicname unitname,
+        lo.loginids as loginid
+        <choose>
+            <when test="vo.ishis == null or vo.ishis == 0">
+                from HIS_DELIVERYORDER t
+            </when>
+            <when test="vo.ishis == 1">
+                from Deliveryorder t
+            </when>
+        </choose>
+        left join goods g1
+        on d.xgoodsid = g1.goodsid
+        left join goods g2
+        on d.pgoodsid = g2.goodsid
+        left join deliverygoods dg
+        on d.deliverygoodsid = dg.deliverygoodsid
+        left join TAAccount t
+        on d.accountid = t.accountid
+        left join useraccount u
+        on u.userid = t.userid
+        left join wrfactortype wft on d.wrfactortypeid = wft.wrfactortypeid
+        left join wrstandard wr on wft.wrstandardid = wr.wrstandardid
+        left join enumdicitem dic on wr.unitid=dic.enumitemname and dic.enumdiccode = 'goodsunit'
+        left join VIEW_USER_LOGINIDS lo on u.userid = lo.userid
+        <where>
+            d.selldeliveryapplyorderid is null and d.isvaliddata = 1
+            <if test="vo.deliveryorderid != null and vo.deliveryorderid != ''">
+                AND d.deliveryorderid like '%'||#{vo.deliveryorderid}||'%'
+            </if>
+            <if test="vo.accountname != null and vo.accountname != ''">
+                AND u.accountname like '%'||#{vo.accountname}||'%'
+            </if>
+            <if test="vo.xgoodsid != null and vo.xgoodsid != ''">
+                AND d.xgoodsid = #{vo.xgoodsid}
+            </if>
+            <if test="vo.wrstandardid != null">
+                and wr.wrstandardid = #{vo.wrstandardid}
+            </if>
+            <if test="vo.deliveryorderstatus != null and vo.deliveryorderstatus != ''">
+                and deliveryorderstatus = #{vo.deliveryorderstatus}
+            </if>
+            <if test="vo.startdate != null and vo.startdate != '' and vo.enddate != null and vo.enddate != '' ">
+                and to_date(d.histradedate,'yyyyMMdd') between to_date(#{vo.startdate},'yyyy-MM-dd')
+                and to_date(#{vo.enddate},'yyyy-MM-dd')
+            </if>
+        </where>
+        order by d.histradedate desc
+    </select>
+
+    <select id="queryDeliveryOrderById" resultType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderDetailResult">
+        SELECT
+        <choose>
+            <when test="histradedate != null and histradedate != ''">
+                d.histradedate,
+            </when>
+        </choose>
+        d.tradedate,
+        d.deliveryorderid,
+        d.deliveryticket,
+        d.accountid,
+        d.xgoodsid, d.xdeliveryqty, d.xdeliveryprice,
+        d.pgoodsid, d.pdeliveryqty, d.pdeliveryprice,d.ppricemode,
+        d.p2goodsid, d.p2deliveryqty, d.p2deliveryprice,d.p2pricemode,
+        d.deliverygoodsid, d.deliveryqty,
+        d.deliveryorderfrom,
+        d.clientticket,
+        d.deliveryorderstatus,
+        d.handlestatus,
+        d.ordertime,
+        d.matchaccountid,
+        d.brandid ,
+        d.qualityid ,
+        d.specid ,
+        d.warehouseid ,
+        d.retcode ,
+        d.deliverymonthid ,
+        d.audittime,
+        d.auditremark,
+        d.wrfactortypeid,
+        sm.logincode as auditname,
+        g1.goodsname as xgoodsname,
+        g2.goodsname as pgoodsname,
+        g3.goodsname as p2goodsname,
+        dg.deliverygoodsname,
+        dgp1.pricemovedesc as brandname ,
+        dgp2.pricemovedesc as specname ,
+        dgp3.pricemovedesc as qualityname ,
+        dgp4.pricemovedesc as warehousename ,
+        dgp5.pricemovedesc as deliverymonthname
+        <choose>
+            <when test="histradedate != null and histradedate != ''">
+                from HIS_DELIVERYORDER t
+            </when>
+            <otherwise>
+                from Deliveryorder t
+            </otherwise>
+        </choose>
+        left join goods g1
+        on d.xgoodsid = g1.goodsid
+        left join goods g2
+        on d.pgoodsid = g2.goodsid
+        left join goods g3
+        on d.p2goodsid = g3.goodsid
+        left join deliverygoods dg
+        on d.deliverygoodsid = dg.deliverygoodsid
+        left join deliverygoodspricemove dgp1 on dgp1.autoid = d.brandid
+        left join deliverygoodspricemove dgp2 on dgp2.autoid = d.specid
+        left join deliverygoodspricemove dgp3 on dgp3.autoid = d.qualityid
+        left join deliverygoodspricemove dgp4 on dgp4.autoid = d.warehouseid
+        left join deliverygoodspricemove dgp5 on dgp5.autoid = d.deliverymonthid
+        left join SystemManager sm on sm.autoid = d.auditid
+        <where>
+            d.deliveryorderid = #{deliveryorderid} and d.isvaliddata = 1
+            <if test="histradedate != null and histradedate != ''">
+                and d.histradedate = #{histradedate}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="queryWRFactorTypeItemNew" resultType="com.muchinfo.mtp3pojos.entity.Wrfactortypeitem">
+        select w.*,
+        t.itemtypename dgfactoryitemtypename,
+        f.dgfactoryitemvalue dgfactoryitemname
+        from wrfactortype wft
+        left join wrfactortypeitem w on wft.wrfactortypeid = w.wrfactortypeid
+        left join DGFactoryItemType t on t.itemtypemode = 1 and wft.deliverygoodsid = t.deliverygoodsid and w.dgfactoryitemtypeid = t.dgfactoryitemtypeid
+        left join DGFactoryItem f on w.dgfactoryitemid = f.dgfactoryitemid
+        <where>
+            <if test="wrfactortypeid != null and wrfactortypeid != ''">
+                and w.wrfactortypeid = #{wrfactortypeid}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -102,6 +102,7 @@
         <result column="ATTACHMENT1" property="attachment1" />
         <result column="ATTACHMENT2" property="attachment2" />
         <result column="QQ" property="qq" />
+        <result column="DISTRICTID" property="districtid" />
         <association property="pathName" column="DISTRICTID"
                      jdbcType="VARCHAR" select="com.muchinfo.mtp3interface.mapper.IDivisionMapper.selectAreaPathName"></association>
     </resultMap>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muchinfo.mtp3interface.mapper.IWrstandardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.muchinfo.mtp3pojos.entity.Wrstandard">
+        <id column="WRSTANDARDID" property="wrstandardid" />
+        <result column="WRSTANDARDCODE" property="wrstandardcode" />
+        <result column="WRSTANDARDNAME" property="wrstandardname" />
+        <result column="DELIVERYGOODSID" property="deliverygoodsid" />
+        <result column="UNITID" property="unitid" />
+        <result column="MINIVALUE" property="minivalue" />
+        <result column="MINIVALUEDP" property="minivaluedp" />
+        <result column="REALMINIVALUE" property="realminivalue" />
+        <result column="REALMINIVALUEDP" property="realminivaluedp" />
+        <result column="WRSSTATUS" property="wrsstatus" />
+        <result column="CREATORID" property="creatorid" />
+        <result column="CREATETIME" property="createtime" />
+        <result column="UPDATORID" property="updatorid" />
+        <result column="UPDATETIME" property="updatetime" />
+        <result column="FACTORYITEMJSON" property="factoryitemjson" />
+        <result column="ISVALID" property="isvalid" />
+        <result column="AREAUSERID" property="areauserid" />
+        <result column="REMARK" property="remark" />
+        <result column="CONVERTFACTOR" property="convertfactor" />
+        <result column="VATRATE" property="vatrate" />
+        <result column="STORAGEFEE" property="storagefee" />
+        <result column="THUMURLS" property="thumurls" />
+        <result column="PICTUREURLS" property="pictureurls" />
+        <result column="BANNERPICURL" property="bannerpicurl" />
+        <result column="PROVIDERUSERID" property="provideruserid" />
+        <result column="PROVIDERACCOUNTID" property="provideraccountid" />
+        <result column="REFGOODSID" property="refgoodsid" />
+        <result column="REFGOODSCODE" property="refgoodscode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        WRSTANDARDID, WRSTANDARDCODE, WRSTANDARDNAME, DELIVERYGOODSID, UNITID, MINIVALUE, MINIVALUEDP, REALMINIVALUE, REALMINIVALUEDP, WRSSTATUS, CREATORID, CREATETIME, UPDATORID, UPDATETIME, FACTORYITEMJSON, ISVALID, AREAUSERID, REMARK, CONVERTFACTOR, VATRATE, STORAGEFEE, THUMURLS, PICTUREURLS, BANNERPICURL, PROVIDERUSERID, PROVIDERACCOUNTID, REFGOODSID, REFGOODSCODE
+    </sql>
+
+    <select id="queryWRStandard" parameterType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderWrsParam"
+            resultType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderWrsResult">
+        select t.* , edi.enumdicname unitname, mgedi.enumdicname mgunitname, cd.convertratio mgconvertfactor,
+        decode(t.wrstandardcode,null,t.wrstandardname,t.wrstandardcode||'/'||t.wrstandardname) wrcodeandname,
+        dg.deliverygoodsname
+        from WRStandard t
+        left join deliverygoods dg on t.deliverygoodsid = dg.deliverygoodsid
+        left join enumdicitem edi on t.unitid = edi.enumitemname and edi.enumdiccode='goodsunit'
+        left join ERMS2_WRSConvertDetail cd on t.deliverygoodsid = cd.deliverygoodsid and t.wrstandardid = cd.wrstandardid
+        left join ERMS_MIDDLEGOODS mg on cd.middlegoodsid = mg.middlegoodsid
+        left join enumdicitem mgedi on mg.goodsunitid = mgedi.enumitemname and mgedi.enumdiccode='goodsunit'
+        <where>
+            <if test="vo.searchcode != null and vo.searchcode != ''">
+                and t.wrstandardname like '%'||#{vo.searchcode}||'%'
+            </if>
+            <if test="vo.isvalid != null">
+                and t.isvalid = #{vo.isvalid}
+            </if>
+        </where>
+        order by t.updatetime desc, t.wrstandardcode
+    </select>
+</mapper>

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

@@ -2,6 +2,7 @@ package com.muchinfo.mtp3interface.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muchinfo.mtp3pojos.entity.Goods;
+import com.muchinfo.mtp3pojos.vo.common.GoodsSelectParam;
 import com.muchinfo.mtp3pojos.vo.common.GoodsSelectResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface IGoodsMapper extends BaseMapper<Goods> {
 
-    List<GoodsSelectResult> queryGoodsSelect(@Param("split") String[] split,@Param("marketId")  Long marketId,@Param("searchCode")  String searchCode);
+    List<GoodsSelectResult> queryGoodsSelect(@Param("split") String[] split, @Param("vo")GoodsSelectParam param);
 
     List<Goods> getNoTradeConfigGoods(@Param("areauserid")Long areauserid,@Param("usergroupid") Long usergroupid,@Param("marketid") Long marketid);
 }

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

@@ -25,7 +25,7 @@ public interface ILoginaccountMapper extends BaseMapper<Loginaccount> {
 
     List<Long> getLoginNotExistsLt(Long userId);
 
-    IPage<InvestorLoginQueryResult> queryLoginAccountPage(IPage<InvestorLoginQueryResult> page, InvestorLoginQueryParam param);
+    IPage<InvestorLoginQueryResult> queryLoginAccountPage(IPage<InvestorLoginQueryResult> page, @Param("vo") InvestorLoginQueryParam param);
 
     IPage<TradingAccountQueryResult> queryTradingAccount(IPage<TradingAccountQueryResult> page, @Param("vo") TradingAccountQueryParam param);
 }

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

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3interface.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.muchinfo.mtp3pojos.entity.TradeOrderdetail;
+import com.muchinfo.mtp3pojos.entity.Wrfactortypeitem;
 import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunCutPositionResult;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
@@ -11,11 +12,16 @@ import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetParam;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResult;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractSheetResultDetail;
 import com.muchinfo.mtp3pojos.vo.query.contract.ContractTradeResult;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderDetailResult;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderEntrustParam;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderEntrustResult;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.goodstrade.GoodsTradeQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.investorsum.InvestorSumQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.position.*;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryParam;
+import com.muchinfo.mtp3pojos.vo.query.tradesum.TradeSumQueryResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -93,4 +99,14 @@ public interface ITradeOrderdetailMapper extends BaseMapper<TradeOrderdetail> {
     List<GoodsTradeQueryResult> queryByAGoodsDate(@Param("vo") GoodsTradeQueryParam param);
 
     IPage<MarketRunCutPositionResult> queryCutListFromOrderDetail(IPage<MarketRunCutPositionResult> page);
+
+    IPage<TradeSumQueryResult> queryTradeSum(IPage<TradeSumQueryResult> page, @Param("vo")TradeSumQueryParam param);
+
+    List<TradeSumQueryResult> queryTradeSum(@Param("vo")TradeSumQueryParam param);
+
+    IPage<DeliveryOrderEntrustResult> queryDeliveryOrder(IPage<DeliveryOrderEntrustResult> page, @Param("vo")DeliveryOrderEntrustParam param);
+
+    DeliveryOrderDetailResult queryDeliveryOrderById(@Param("deliveryorderid")String deliveryorderid, @Param("histradedate")String histradedate);
+
+    List<Wrfactortypeitem> queryWRFactorTypeItemNew(@Param("wrfactortypeid")String wrfactortypeid);
 }

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Wrfactortypeitem;
+
+/**
+ * <p>
+ * 仓单要素类型选择项表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-10-08
+ */
+public interface IWrfactortypeitemMapper extends BaseMapper<Wrfactortypeitem> {
+
+}

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

@@ -2,6 +2,11 @@ package com.muchinfo.mtp3interface.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muchinfo.mtp3pojos.entity.Wrstandard;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderWrsParam;
+import com.muchinfo.mtp3pojos.vo.query.deliveryorder.DeliveryOrderWrsResult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.muchinfo.mtp3pojos.entity.Wrstandard;
  */
 public interface IWrstandardMapper extends BaseMapper<Wrstandard> {
 
+    List<DeliveryOrderWrsResult> queryWRStandard(@Param("vo") DeliveryOrderWrsParam param);
 }

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

@@ -31,7 +31,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @KeySequence(value = "SEQ_SYSTEMMANAGER")
-public class Systemmanager extends Model<Systemmanager> implements UserDetails,Serializable{
+public class    Systemmanager extends Model<Systemmanager> implements UserDetails,Serializable{
 
     private static final long serialVersionUID = 1L;
 

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

@@ -11,8 +11,6 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Blob;
 import java.util.Date;
 
 /**
@@ -46,7 +44,7 @@ public class TodayAccountmargin extends Model<TodayAccountmargin> {
 
     @ApiModelProperty(value = "保证金信息(存储配置的Protobuffer串)")
     @TableField("INFOCONTENT")
-    private Blob infocontent;
+    private byte[] infocontent;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATEDATE")

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

@@ -11,8 +11,6 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Blob;
 import java.util.Date;
 
 /**
@@ -46,7 +44,7 @@ public class TodayAccounttradefee extends Model<TodayAccounttradefee> {
 
     @ApiModelProperty(value = "交易费用信息(存储配置的Protobuffer串)")
     @TableField("INFOCONTENT")
-    private Blob infocontent;
+    private byte[] infocontent;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATEDATE")

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

@@ -11,8 +11,6 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Blob;
 import java.util.Date;
 
 /**
@@ -46,7 +44,7 @@ public class TodayAccounttraderule extends Model<TodayAccounttraderule> {
 
     @ApiModelProperty(value = "交易规则信息(存储配置的Protobuffer串)")
     @TableField("INFOCONTENT")
-    private Blob infocontent;
+    private byte[] infocontent;
 
     @ApiModelProperty(value = "市场ID")
     @TableField("MARKETID")

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

@@ -0,0 +1,72 @@
+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.util.Date;
+
+/**
+ * <p>
+ * 仓单要素类型选择项表
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("WRFACTORTYPEITEM")
+@ApiModel(value="Wrfactortypeitem对象", description="仓单要素类型选择项表")
+public class Wrfactortypeitem extends Model<Wrfactortypeitem> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)")
+    private Long wrfactortypeid;
+
+    @ApiModelProperty(value = "要素选择项类型ID")
+    @TableField("DGFACTORYITEMTYPEID")
+    private Long dgfactoryitemtypeid;
+
+    @ApiModelProperty(value = "选择项ID")
+    @TableField("DGFACTORYITEMID")
+    private Long dgfactoryitemid;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATORID")
+    private Long creatorid;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("UPDATORID")
+    private Long updatorid;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+    @TableField(select = false)
+    private String dgfactoryitemtypename;
+
+    @TableField(select = false)
+    private String dgfactoryitemname;
+
+    @Override
+    public Serializable pkVal() {
+        return this.wrfactortypeid;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/common/GoodsSelectParam.java

@@ -0,0 +1,23 @@
+package com.muchinfo.mtp3pojos.vo.common;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "GoodsSelectParam对象", description = "商品下拉列表查询")
+public class GoodsSelectParam {
+
+    private String goodsStatusIds;
+
+    private Long marketId;
+
+    private String searchCode;
+
+    private String deliveryflag;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderDetailResult.java

@@ -0,0 +1,99 @@
+package com.muchinfo.mtp3pojos.vo.query.deliveryorder;
+
+import com.muchinfo.mtp3pojos.entity.Wrfactortypeitem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "DeliveryOrderDetailResult对象", description = "交收委托查询详情")
+public class DeliveryOrderDetailResult {
+
+    private String wrfactortypeid;
+
+    @ApiModelProperty(value = "申报流水号 ")
+    private String deliveryticket;
+
+    @ApiModelProperty(value = "委托单号 ")
+    private String deliveryorderid;
+
+    private Date histradedate;
+
+    private Date tradedate;
+
+    @ApiModelProperty(value = "申报人(账号) ")
+    private String accountname;
+
+    private Long accountid;
+
+    @ApiModelProperty(value = "对手(账号) ")
+    private String matchaccountname;
+
+    private Long matchaccountid;
+
+    @ApiModelProperty(value = "状态")
+    private Integer deliveryorderstatus;
+
+    private String auditremark;
+
+    @ApiModelProperty(value = "申报时间 ")
+    private Date ordertime;
+
+    @ApiModelProperty(value = "审核人 ")
+    private String auditname;
+
+    @ApiModelProperty(value = "审核时间 ")
+    private Date audittime;
+
+    @ApiModelProperty(value = "错误信息 ")
+    private String retcode;
+
+    @ApiModelProperty(value = "现货商品 ")
+    private String wrstandardcode;
+
+    private String wrstandardname;
+
+    @ApiModelProperty(value = "现货数量 ")
+    private Integer deliveryqty;
+
+    private String deliverygoodsunitname;
+
+    private List<Wrfactortypeitem> wrFactorTypeItemList;
+
+    @ApiModelProperty(value = "交易合约 ")
+    private String xgoodsname;
+
+    @ApiModelProperty(value = "交收价格 ")
+    private BigDecimal xdeliveryprice;
+
+    @ApiModelProperty(value = "合约数量 ")
+    private Integer xdeliveryqty;
+
+    @ApiModelProperty(value = "辅助合约一 ")
+    private Integer ppricemode;
+
+    private String pgoodsname;
+
+    private BigDecimal pdeliveryprice;
+
+    private Integer pdeliveryqty;
+
+    @ApiModelProperty(value = "辅助合约二 ")
+    private String p2goodsname;
+
+    private Integer p2pricemode;
+
+    private BigDecimal p2deliveryprice;
+
+    private Integer p2deliveryqty;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderEntrustParam.java

@@ -0,0 +1,46 @@
+package com.muchinfo.mtp3pojos.vo.query.deliveryorder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "DeliveryOrderEntrustParam对象", description = "交收委托查询")
+public class DeliveryOrderEntrustParam {
+
+    @ApiModelProperty(value = "申报单号 ")
+    private String deliveryorderid;
+
+    @ApiModelProperty(value = "申 报 人")
+    private String accountname;
+
+    @ApiModelProperty(value = "主 商 品")
+    private Long xgoodsid;
+
+    @ApiModelProperty(value = "现货商品")
+    private Long wrstandardid;
+
+    @ApiModelProperty(value = "状  态")
+    private Integer deliveryorderstatus;
+
+    @ApiModelProperty(value = "0 当前 ，1 历史")
+    private Integer ishis;
+
+    @ApiModelProperty(value = "开始日期")
+    private String startdate;
+
+    @ApiModelProperty(value = "结束日期")
+    private String enddate;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderEntrustResult.java

@@ -0,0 +1,48 @@
+package com.muchinfo.mtp3pojos.vo.query.deliveryorder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "DeliveryOrderEntrustResult对象", description = "交收委托查询响应")
+public class DeliveryOrderEntrustResult {
+
+    @ApiModelProperty(value = "历史交易日")
+    private Date histradedate;
+
+    @ApiModelProperty(value = "申报流水")
+    private String deliveryticket;
+
+    @ApiModelProperty(value = "申报单号")
+    private String deliveryorderid;
+
+    @ApiModelProperty(value = "申报人")
+    private String accountid;
+
+    @ApiModelProperty(value = "主商品")
+    private String xgoodsname;
+
+    @ApiModelProperty(value = "主商品手数")
+    private String xdeliveryqty;
+
+    @ApiModelProperty(value = "现货商品")
+    private String deliverygoodsname;
+
+    @ApiModelProperty(value = "现货数量")
+    private String deliveryqty;
+
+    @ApiModelProperty(value = "状态")
+    private Integer deliveryorderstatus;
+
+    @ApiModelProperty(value = "申报时间")
+    private Date ordertime;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderWrsParam.java

@@ -0,0 +1,19 @@
+package com.muchinfo.mtp3pojos.vo.query.deliveryorder;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "DeliveryOrderWrsParam对象", description = "现货商品")
+public class DeliveryOrderWrsParam {
+
+    private String searchcode;
+
+    private Integer isvalid;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderWrsResult.java

@@ -0,0 +1,19 @@
+package com.muchinfo.mtp3pojos.vo.query.deliveryorder;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "DeliveryOrderWrsResult对象", description = "现货商品")
+public class DeliveryOrderWrsResult {
+
+    private Long wrstandardid;
+
+    private String wrstandardname;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/tradesum/TradeSumQueryParam.java

@@ -0,0 +1,37 @@
+package com.muchinfo.mtp3pojos.vo.query.tradesum;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "TradeSumQueryParam对象", description = "成交汇总查询")
+public class TradeSumQueryParam {
+
+    @ApiModelProperty(value = "日 期 yyyyMMdd")
+    private String cycletime;
+
+    @ApiModelProperty(value = "商品")
+    private Long goodsid;
+
+    @ApiModelProperty(value = "方向 buyOrSell")
+    private Long buyorsell;
+
+    @ApiModelProperty(value = "登录账号")
+    private Long loginid;
+
+    @ApiModelProperty(value = "成交类别")
+    private Long tradetypes;
+
+    @ApiModelProperty(value = "* 页码 *")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "* 页大小 *")
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/tradesum/TradeSumQueryResult.java

@@ -0,0 +1,76 @@
+package com.muchinfo.mtp3pojos.vo.query.tradesum;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.muchinfo.mtp3pojos.exportconverter.BuyOrSellConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "TradeSumQueryResult对象", description = "商品成交汇总响应")
+public class TradeSumQueryResult {
+
+    @ExcelProperty("交易日")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "交易日")
+    private String tradeDate;
+
+    @ExcelProperty("登录账号")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "登录账号")
+    private Long loginid;
+
+    @ExcelProperty("用户名称")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "用户名称")
+    private String currentname;
+
+    @ExcelProperty("所属机构")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "所属机构")
+    private String parentusername;
+
+    @ExcelProperty("商品代码")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "商品代码")
+    private String goodscode;
+
+    @ExcelProperty("商品名称")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "商品名称")
+    private String goodsname;
+
+    @ExcelProperty(value = "方向", converter = BuyOrSellConverter.class)
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "方向")
+    private Integer buyorselldisplay;
+
+    @ExcelProperty("成交数量")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "成交数量")
+    private Integer tradeqty;
+
+    @ExcelProperty("成交价格")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "成交价格")
+    private BigDecimal tradepriceavg;
+
+    @ExcelProperty("成交金额")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "成交金额")
+    private BigDecimal tradeamount;
+
+    @ExcelProperty("手续费")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "手续费")
+    private BigDecimal totalcharge;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/tradingacc/TradingAccountDetailResult.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/tradingacc/TradingAccountAddParam.java

@@ -1,7 +1,6 @@
 package com.muchinfo.mtp3pojos.vo.tradingacc;
 
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,10 +10,8 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value="TradingAccountDetailResult对象", description="交易账号管理详情")
-public class TradingAccountDetailResult {
-
-    @ApiModelProperty(value = "登录账号")
-    private Long loginid;
+@ApiModel(value="TradingAccountAddParam对象", description="交易账号管理新增")
+public class TradingAccountAddParam {
 
+    private Integer a;
 }