zyy
2025-11-19 db2df18d934abbb3514ea8e7162f037a69988eae
优化
7 files modified
17 ■■■■ changed files
trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java 2 ●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/admin/model/exchange/ExchangeApplyOrderListModel.java 3 ●●●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java 3 ●●●●● patch | view | raw | blame | history
trading-order-service/src/main/java/com/yami/trading/dao/exchange/ExchangeApplyOrderMapper.java 1 ●●●● patch | view | raw | blame | history
trading-order-service/src/main/java/com/yami/trading/service/exchange/ExchangeApplyOrderService.java 1 ●●●● patch | view | raw | blame | history
trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java 4 ●●●● patch | view | raw | blame | history
trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml 3 ●●●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java
@@ -69,7 +69,7 @@
    public Result list(@RequestBody @Valid ExchangeApplyOrderListModel model) {
        Page page = new Page(model.getCurrent(), model.getSize());
        exchangeApplyOrderService.listPage(page, model.getRoleName(), model.getUserName(), model.getOrderNo(),
                model.getState(), model.getOffset(), model.getType(), model.getUserCode(), model.getSymbol(), permissionFacade.getOwnerUserIds());
                model.getState(), model.getOffset(), model.getType(), model.getUserCode(), model.getSymbol(), model.getUsernameParent(),  permissionFacade.getOwnerUserIds());
        List<ExchangeApplyOrderDto> list = page.getRecords();
        for (int i = 0; i < list.size(); i++) {
            ExchangeApplyOrderDto dto = list.get(i);
trading-order-admin/src/main/java/com/yami/trading/admin/model/exchange/ExchangeApplyOrderListModel.java
@@ -31,5 +31,8 @@
    @ApiModelProperty("uid")
    private String userCode;
    @ApiModelProperty("推荐人")
    private  String usernameParent;
    private String symbol;
}
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiRealNameAuthContoller.java
@@ -90,6 +90,9 @@
        if (model.getName().length()  >50) {
            throw new YamiShopBindException("实名姓名长度超过50");
        }
        if (model.getPhone() == null || model.getPhone().isEmpty()) {
            throw new YamiShopBindException("请输入手机号");
        }
        /*String authcode = identifyingCodeTimeWindowService.getAuthCode(model.getPhone());
        if (authcode == null || !authcode.equals(model.getCode())) {
trading-order-service/src/main/java/com/yami/trading/dao/exchange/ExchangeApplyOrderMapper.java
@@ -23,6 +23,7 @@
                                         @Param("symbolType") String symbolType,
                                         @Param("userCode") String userCode,
                                         @Param("symbol") String symbol,
                                         @Param("usernameParent") String usernameParent,
                                         @Param("userIds") List<String> userIds
    );
trading-order-service/src/main/java/com/yami/trading/service/exchange/ExchangeApplyOrderService.java
@@ -72,6 +72,7 @@
                                         String userName,
                                         String orderNo,
                                         String state, String offset, String symbolType, String userCode, String symbol,
                                         String usernameParent,
                                         List<String> userIds);
    ExchangeApplyOrder findByOrderNo(String orderNo);
trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
@@ -520,8 +520,8 @@
    @Override
    public Page<ExchangeApplyOrderDto> listPage(Page page, String rolename, String userName, String orderNo, String state,
                                                String offset, String symbolType, String userCode, String symbol, List<String> userIds) {
        return baseMapper.listPage(page, rolename, userName, orderNo, state, offset, symbolType, userCode, symbol, userIds);
                                                String offset, String symbolType, String userCode, String symbol, String usernameParent, List<String> userIds) {
        return baseMapper.listPage(page, rolename, userName, orderNo, state, offset, symbolType, userCode, symbol, usernameParent, userIds);
    }
    @Override
trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml
@@ -33,6 +33,9 @@
      <if test="rolename!=null and rolename!=''">
          and party.role_name=#{rolename}
      </if>
      <if test="usernameParent!=null and usernameParent!=''">
          and ur.user_name like  CONCAT('%', #{usernameParent}, '%')
      </if>
      <if test="symbolType!=null and symbolType!=''">
          and item.type=#{symbolType}
      </if>