edit agentname

src/main/java/com/xc/controller/StockApiController.java

@@ -68,7 +68,7 @@ public class StockApiController {
     //通过货币代码查询货币信息
     @RequestMapping({"getSingleStockConfig.do"})
     @ResponseBody
-    public ServerResponse getSingleStockConfig(@RequestParam("code") String code) {
-        return this.iStockService.getSingleStockConfig(code);
+    public ServerResponse getSingleStockConfig(@RequestParam("id") Integer id) {
+        return this.iStockService.getSingleStockConfig(id);
     }
 }

src/main/java/com/xc/pojo/UserPosition.java

@@ -23,7 +23,6 @@ public class UserPosition {
     private BigDecimal buyOrderPrice;
     private String sellOrderId;
     private Date sellOrderTime;
-
     private BigDecimal sellOrderPrice;
     private BigDecimal profitTargetPrice;
     private BigDecimal stopTargetPrice;
@@ -48,6 +47,7 @@ public class UserPosition {
     private BigDecimal depositFreezeAmt;
     // 挂单
     private Integer entryOrders;// 0持仓 1平仓 2挂单
+    private String agentName;
 
     public UserPosition() {
     }
@@ -61,7 +61,7 @@ public class UserPosition {
             , String sellOrderId, Date sellOrderTime, BigDecimal sellOrderPrice, BigDecimal profitTargetPrice, BigDecimal stopTargetPrice
             , String orderDirection, Integer orderNum, BigDecimal orderLever, BigDecimal orderTotalPrice, BigDecimal orderFee, BigDecimal orderSpread
             , BigDecimal orderStayFee, Integer orderStayDays, BigDecimal profitAndLose, BigDecimal allProfitAndLose, Integer isLock, String lockMsg
-            , String stockPlate, BigDecimal depositFreezeAmt, Integer entryOrders,BigDecimal stoploss,BigDecimal targetprofit) {
+            , String stockPlate, BigDecimal depositFreezeAmt, Integer entryOrders,BigDecimal stoploss,BigDecimal targetprofit ,String agentName) {
         this.id = id;
         this.positionType = positionType;
         this.positionSn = positionSn;
@@ -97,6 +97,7 @@ public class UserPosition {
         this.entryOrders = entryOrders;
         this.targetprofit=targetprofit;
         this.stoploss=stoploss;
+        this.agentName = agentName;
     }
 
 

src/main/java/com/xc/pojo/UserRecharge.java

@@ -26,13 +26,14 @@ public class UserRecharge {
     private String orderDesc;
     private Date addTime;
     private Date payTime;
+    private String agentName;
 
     public UserRecharge(){
 
     }
 
     public UserRecharge(Integer id, Integer userId, String nickName, Integer agentId, String orderSn, String paySn, String payChannel
-            , BigDecimal payAmt, Integer orderStatus, String orderDesc, Date addTime, Date payTime, BigDecimal payAmtRMB) {
+            , BigDecimal payAmt, Integer orderStatus, String orderDesc, Date addTime, Date payTime, BigDecimal payAmtRMB,String agentName) {
 
         this.id = id;
 
@@ -58,6 +59,7 @@ public class UserRecharge {
 
         this.payTime = payTime;
         this.payAmtRMB = payAmtRMB;
+        this.agentName= agentName;
     }
 
 }

src/main/java/com/xc/service/IStockService.java

@@ -33,7 +33,7 @@ public interface IStockService {
 
     ServerResponse getSingleStock(Integer id);
 
-    ServerResponse getSingleStockConfig(String paramString);
+    ServerResponse getSingleStockConfig( Integer id);
 
     ServerResponse getMinK(String paramString, Integer paramInteger1, Integer paramInteger2, Integer paramInteger3);
 

src/main/java/com/xc/service/impl/PayServiceImpl.java

@@ -70,7 +70,7 @@ public class PayServiceImpl implements IPayService {
         userRecharge.setUserId(user.getId());
         userRecharge.setNickName(user.getRealName());
         userRecharge.setAgentId(user.getAgentId());
-
+        userRecharge.setAgentName(user.getAgentName());
         String ordersn = KeyUtils.getRechargeOrderSn();
         userRecharge.setOrderSn(ordersn);
 
@@ -209,7 +209,7 @@ public class PayServiceImpl implements IPayService {
         userRecharge.setUserId(user.getId());
         userRecharge.setNickName(user.getRealName());
         userRecharge.setAgentId(user.getAgentId());
-
+        userRecharge.setAgentName(user.getAgentName());
         String ordersn = KeyUtils.getRechargeOrderSn();
         userRecharge.setOrderSn(ordersn);
 

src/main/java/com/xc/service/impl/StockServiceImpl.java

@@ -263,11 +263,9 @@ public class StockServiceImpl implements IStockService {
         }
     }
 
-    public ServerResponse getSingleStockConfig(String code) {
-        if (StringUtils.isBlank(code))
-            return ServerResponse.createByErrorMsg("code为空");
+    public ServerResponse getSingleStockConfig(Integer id) {
         //TODO  查询详情
-        Stock stock = this.stockMapper.findStockByCode(code);
+        Stock stock = this.stockMapper.selectByPrimaryKey(id);
         return ServerResponse.createBySuccess(stock);
     }
 

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

@@ -254,6 +254,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
             userPositionInsert.setUserId(userPosition.getUserId());
             userPositionInsert.setNickName(userPosition.getNickName());
             userPositionInsert.setAgentId(userPosition.getAgentId());
+            userPositionInsert.setAgentName(userPosition.getAgentName());
             userPositionInsert.setStockCode(userPosition.getStockCode());
             userPositionInsert.setStockName(userPosition.getStockName());
             userPositionInsert.setStockGid(userPosition.getStockGid());
@@ -584,7 +585,8 @@ public class UserPositionServiceImpl implements IUserPositionService {
             // 手续费
             BigDecimal position_freez = new BigDecimal(buyNum*stock.getTransFee());
             //冻结保证金
-            BigDecimal depositFreezeAmt = new BigDecimal(buyNum*stock.getDepositAmt());
+            BigDecimal depositFreezeAmt = buyOrderPrice.multiply(new BigDecimal(stock.getContractSize())).multiply(new BigDecimal(buyNum)).divide(new BigDecimal(stock.getSiteLever()),2,4);
+            log.info("冻结保证金 = "+depositFreezeAmt);
             BigDecimal subtractDepositFreezeAmt = user_enable_amt.subtract(depositFreezeAmt).subtract(position_freez);
             log.info("挂单冻结保证金="+depositFreezeAmt);
 //            depositFreezeAmt = depositFreezeAmt.add(position_freez);
@@ -610,6 +612,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
             userPosition.setUserId(user.getId());
             userPosition.setNickName(user.getRealName());
             userPosition.setAgentId(user.getAgentId());
+            userPosition.setAgentName(user.getAgentName());
             userPosition.setStockCode(stock.getStockCode());
             userPosition.setStockName(stock.getStockName());
             userPosition.setStockGid(stock.getStockGid());
@@ -634,21 +637,6 @@ public class UserPositionServiceImpl implements IUserPositionService {
             userPosition.setDepositFreezeAmt(depositFreezeAmt);
             userPosition.setEntryOrders(1);
             int insertPositionCount = this.userPositionMapper.insertSelective(userPosition);
-//            UserCapitalDetail userCapitalDetail = new UserCapitalDetail();
-//            userCapitalDetail.setAgentId(user.getAgentId());
-//            userCapitalDetail.setAgentName(user.getAgentName());
-//            userCapitalDetail.setUserId(user.getId());
-//            userCapitalDetail.setUserName(user.getRealName());
-//            userCapitalDetail.setDeType(3);
-//            userCapitalDetail.setIsRead(Integer.valueOf(0));
-//            userCapitalDetail.setOrderNum(buyNum);
-//            userCapitalDetail.setBuyFeeAmt(position_freez);
-//            userCapitalDetail.setOrderSpread(new BigDecimal(0));
-//            userCapitalDetail.setOrderStayFee(new BigDecimal(0));
-//            userCapitalDetail.setAllProfit(new BigDecimal(0));
-//            userCapitalDetail.setStockName(stock.getStockName());
-//            userCapitalDetail.setStockCode(stock.getStockCode());
-//            int insertSxfCount = this.userCashDetailMapper.insertUserCapitalDetail(userCapitalDetail);
             if (insertPositionCount > 0) {
                 log.info("【用户交易挂单】保存持仓记录成功");
             } else {
@@ -783,6 +771,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         userPosition.setUserId(user.getId());
         userPosition.setNickName(user.getRealName());
         userPosition.setAgentId(user.getAgentId());
+        userPosition.setAgentName(user.getAgentName());
         userPosition.setStockCode(stock.getStockCode());
         userPosition.setStockName(stock.getStockName());
         userPosition.setStockGid(stock.getStockGid());
@@ -1370,6 +1359,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         userPosition.setUserId(user.getId());
         userPosition.setNickName(user.getRealName());
         userPosition.setAgentId(user.getAgentId());
+        userPosition.setAgentName(user.getAgentName());
         userPosition.setStockCode(stock.getStockCode());
         userPosition.setStockName(stock.getStockName());
         userPosition.setStockGid(stock.getStockGid());
@@ -1493,6 +1483,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         adminPositionVO.setUserId(position.getUserId());
         adminPositionVO.setNickName(position.getNickName());
         adminPositionVO.setAgentId(position.getAgentId());
+        adminPositionVO.setAgentName(position.getAgentName());
         adminPositionVO.setStockName(position.getStockName());
         adminPositionVO.setStockCode(position.getStockCode());
         adminPositionVO.setStockGid(position.getStockGid());

src/main/java/com/xc/service/impl/UserRechargeServiceImpl.java

@@ -109,6 +109,7 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
         userRecharge.setUserId(user.getId());
         userRecharge.setNickName(user.getRealName());
         userRecharge.setAgentId(user.getAgentId());
+        userRecharge.setAgentName(user.getAgentName());
         String ordersn = KeyUtils.getRechargeOrderSn();
         userRecharge.setOrderSn(ordersn);
         userRecharge.setPayChannel(payType);
@@ -351,7 +352,7 @@ public class UserRechargeServiceImpl implements IUserRechargeService {
         userRecharge.setUserId(user.getId());
         userRecharge.setNickName(user.getRealName());
         userRecharge.setAgentId(user.getAgentId());
-
+        userRecharge.setAgentName(user.getAgentName());
         String ordersn = KeyUtils.getRechargeOrderSn();
         userRecharge.setOrderSn(ordersn);
 

src/main/java/com/xc/vo/position/AdminPositionVO.java

@@ -55,5 +55,6 @@ public class AdminPositionVO {
     private Integer entryOrders;
 
     private BigDecimal hazardRate;
+    private String agentName;
 }
 

src/main/java/com/xc/vo/position/AgentPositionVO.java

@@ -51,5 +51,5 @@ public class AgentPositionVO {
     private String lockMsg;
     private String stockPlate;
     private BigDecimal hazardRate;
-
+    private String agentName;
 }

src/main/java/mappers/UserPositionMapper.xml

@@ -31,25 +31,24 @@
       <arg column="order_stay_days" jdbcType="INTEGER" javaType="java.lang.Integer" />
       <arg column="profit_and_lose" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
       <arg column="all_profit_and_lose" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
-
       <arg column="is_lock" jdbcType="INTEGER" javaType="java.lang.Integer" />
       <arg column="lock_msg" jdbcType="VARCHAR" javaType="java.lang.String" />
-
       <arg column="stock_plate" jdbcType="VARCHAR" javaType="java.lang.String" />
-
       <arg column="depositFreezeAmt" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
       <arg column="entryOrders" jdbcType="INTEGER" javaType="java.lang.Integer" />
-
       <arg column="stoploss" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
       <arg column="targetprofit" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
+      <arg column="agentName" jdbcType="VARCHAR" javaType="java.lang.String" />
     </constructor>
   </resultMap>
+
   <sql id="Base_Column_List" >
     id, position_type, position_sn, user_id, nick_name, agent_id, stock_name, stock_code,
     stock_gid, stock_spell, buy_order_id, buy_order_time, buy_order_price, sell_order_id,
     sell_order_time, sell_order_price, profit_target_price, stop_target_price, order_direction,
     order_num, order_lever, order_total_price, order_fee, order_spread, order_stay_fee,
-    order_stay_days, profit_and_lose, all_profit_and_lose,is_lock,lock_msg,stock_plate,depositFreezeAmt,entryOrders,stop_loss_price stoploss,target_profit_price targetprofit
+    order_stay_days, profit_and_lose, all_profit_and_lose,is_lock,lock_msg,stock_plate,depositFreezeAmt,
+    entryOrders,stop_loss_price stoploss,target_profit_price targetprofit , agent_name agentName
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -544,8 +543,8 @@
           and sell_order_id is null and entryOrders = 1
         </if>
       </if>
-      <if test="nickName != null and userId != '' ">
-        and nick_name = like CONCAT('%','${nickName}','%')
+      <if test="nickName != null and nickName != '' ">
+        and nick_name like CONCAT('%','${nickName}','%')
       </if>
       <if test="positionSn != null and positionSn != '' ">
         and position_sn like CONCAT('%','${positionSn}','%')

src/main/java/mappers/UserRechargeMapper.xml

@@ -16,14 +16,15 @@
       <arg column="add_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
       <arg column="pay_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
       <arg column="pay_amt_rMB" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
+      <arg column="agent_name" jdbcType="VARCHAR" javaType="java.lang.String" />
     </constructor>
   </resultMap>
   <sql id="Base_Column_List" >
-    id, user_id, nick_name, agent_id, order_sn, pay_sn, pay_channel, pay_amt, order_status, 
-    order_desc, add_time, pay_time, pay_amt_rMB
+    id, user_id, nick_name, agent_id, order_sn, pay_sn, pay_channel, pay_amt, order_status,
+    order_desc, add_time, pay_time, pay_amt_rMB ,agent_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from user_recharge
     where id = #{id,jdbcType=INTEGER}
@@ -33,15 +34,16 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.xc.pojo.UserRecharge" >
-    insert into user_recharge (id, user_id, nick_name, 
-      agent_id, order_sn, pay_sn, 
-      pay_channel, pay_amt, order_status, 
-      order_desc, add_time, pay_time, pay_amt_rMB
+    insert into user_recharge (id, user_id, nick_name,
+      agent_id, order_sn, pay_sn,
+      pay_channel, pay_amt, order_status,
+      order_desc, add_time, pay_time, pay_amt_rMB ,agent_name
       )
-    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR}, 
-      #{agentId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{paySn,jdbcType=VARCHAR}, 
-      #{payChannel,jdbcType=VARCHAR}, #{payAmt,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, 
-      #{orderDesc,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, #{payAmtRMB,jdbcType=DECIMAL}
+    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR},
+      #{agentId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{paySn,jdbcType=VARCHAR},
+      #{payChannel,jdbcType=VARCHAR}, #{payAmt,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER},
+      #{orderDesc,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP},
+      #{payAmtRMB,jdbcType=DECIMAL}, #{agentName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.xc.pojo.UserRecharge" >
@@ -168,6 +170,9 @@
       <if test="payAmtRMB != null" >
         pay_amt_rMB = #{payAmtRMB,jdbcType=DECIMAL},
       </if>
+      <if test="agentName != null" >
+        agen_name = #{agentName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -286,4 +291,4 @@
 
 
 
-</mapper>
+</mapper>