1

zj

2024-04-29 de4c1a5257dfaa7ab26265f474b7176f6b55524d

1

 src/main/java/com/nq/pojo/OrderEchoOut.java

@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.data.annotation.Transient;

import java.util.Date;

/**
 * @program: dabao
@@ -20,9 +23,11 @@

    private String returnOfRate;

    private String buyTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
    private Date buyTime;

    private String endTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
    private Date endTime;


    private String userId;

 src/main/java/com/nq/service/impl/EchoServices.java

@@ -76,6 +76,7 @@
                    .eq(UserAssets::getAccectType, "IN")
            );
            userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(money));
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(money));
            userAssetsMapper.updateById(userAssets);
            return orderEchoMapper.insert(orderEchoBean) >= 1;
        }
@@ -129,6 +130,7 @@
            }else{
                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
            }
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(money));
            userAssetsMapper.updateById(userAssets);
            orderEchoBean.setState("2");
            orderEchoBean.setEarnings(incomeAmount.toString());

 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java

@@ -59,6 +59,9 @@
    IUserAssetsServices userAssetsServices;

    @Autowired
    UserAssetsMapper userAssetsMapper;

    @Autowired
    ISiteSettingService iSiteSettingService;

    @Autowired
@@ -117,8 +120,6 @@
    @Autowired
    IStockConfigServices iStockConfigServices;

    @Autowired
    private UserAssetsMapper userAssetsMapper;

    @Transactional
    public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
@@ -1250,6 +1251,7 @@
                return ServerResponse.createByErrorMsg("新股转持仓失败");
            }
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
            userAssetsMapper.updateById(userAssets);
            if (ret > 0) {
                userStockSubscribe.setStatus(5);
                userStockSubscribeMapper.update1(userStockSubscribe);

 src/main/resources/mapper/OrderEchoMapper.xml

@@ -35,7 +35,7 @@
        from order_echo  o
                 join echo e
                      on o.eid = e.id
        where user_id = #{id}
        where user_id = #{id} GROUP BY o.buy_time desc
    </select>

    <select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">

 target/classes/mapper/OrderEchoMapper.xml

@@ -35,7 +35,7 @@
        from order_echo  o
                 join echo e
                      on o.eid = e.id
        where user_id = #{id}
        where user_id = #{id} GROUP BY o.buy_time desc
    </select>

    <select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">