新增字段

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

@@ -101,6 +101,7 @@
                 t.areatype,
                 t.areaaccountid,
                 t.tradedate,
+                g.goodscode,
                 sum(t.totalcount) totalcount,
                 sum(t.totalfee) totalfee,
                 sum(t.divideamount) divideamount
@@ -351,7 +352,7 @@
                     </if>
                 </where>
                 )
-                select f.*,u.accountname areaname,
+                select f.*,u.accountname areaname, g.goodscode,
                 case
                 when substr(to_char(f.tradefeetype), 0, 1) = '2'
                 then ed.enumdicname || '/' || '会员部分'
@@ -383,6 +384,7 @@
                 SELECT
                 T.RECKONDATE,
                 g.goodsname,
+                g.goodscode,
                 m.marketname,
                 SUM(T.TRADEQTY) TRADEQTY,
                 SUM(T.OPENQTY) OPENQTY,

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

@@ -144,7 +144,7 @@
 
     <select id="queryYJCloselList" resultType="com.muchinfo.mtp3pojos.vo.query.order.TerOrderQueryResult"
             parameterType="com.muchinfo.mtp3pojos.vo.query.order.TerOrderQueryParam">
-        select cd.opentradeid, cd.closeid,
+        select cd.opentradeid, cd.closeid,g.goodscode,
         vlog.LOGINIDS loginid, cd.accountid,
         ua.userid || '/' || ua.accountname currentname,
         g.goodscode || '/' || g.goodsname goodsfullname, hd.openprice,
@@ -220,7 +220,7 @@
 
     <select id="queryDeliveryOfflinePage" parameterType="com.muchinfo.mtp3pojos.vo.query.order.DeliveryOrderParam"
             resultType="com.muchinfo.mtp3pojos.vo.query.order.DeliveryOrderResult">
-        select ua.userid || '/' || lo.loginids || '/' || ua.accountname "username",
+        select ua.userid || '/' || lo.loginids || '/' || ua.accountname "username", g.goodscode,
         g.goodscode || '/' || g.goodsname "goodsdisplay",
         e1.enumdicname "buyorselldisplay",
         t.deliveryqty "deliveryqty",
@@ -332,6 +332,7 @@
         --         t.reckondeposit "reckondeposit",
         t.refundabledeposit "refundabledeposit",
         t.payedlatefee "payedlatefee",
+        g.goodscode,
         g.goodscode || '/' || g.goodsname "goodsfullname",
         ua.userid || '/' || ua.accountname "userfullname",
         ua2.userid || '/' || ua2.accountname "areafullname",
@@ -381,6 +382,7 @@
         ua.userid "userid",
         t.accountid "accountid",
         t.marketid "marketid",
+        g.goodscode,
         ua.userid || '/' || ua.accountname "userfullname",
         ua2.userid || '/' || ua2.accountname "memberfullname",
         g.goodscode || '/' || g.goodsname "goodsfullname",

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

@@ -92,6 +92,7 @@
             </when>
         </choose>
         g.goodscode || '/' || g.goodsname goodsCodeName,
+        g.goodscode,
         ta.accountid || '/' || lo.loginids || '/' || ua.accountname as accountNameId,
         t.orderqty * t.orderprice * g.agreeunit as orderaccount, t.marketmaxsub as marketmaxsub,
         <choose>
@@ -393,6 +394,7 @@
         select
         td.tradeid,td.accountid,td.buyorsell,td.buildtype,td.tradetype,
         td.tradeprice,td.tradeqty, td.tradeamount,td.tradetime,
+        g.goodscode,
         g.goodscode || '/' || g.goodsname goodsCodeName,
         vlog.loginids as loginid,
         ua.accountname as currentname,td.closepl,
@@ -1060,7 +1062,7 @@
             resultType="com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult">
         SELECT
         '--' as tradedate,
-        ua.userid || '/' || t.accountid || '/' || ua.accountname as userfullname,
+        ua.userid || '/' || t.accountid || '/' || ua.accountname as userfullname, g.goodscode,
         g.goodscode || '/' || g.goodsname as  goodsfullname,
         case
         when  (ua.usertype = 5 and pua.userid != mua.userid) then  pua.userid || '/' || to_char(pua.accountname)
@@ -1122,7 +1124,7 @@
             resultType="com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult">
         SELECT
         t.reckondate as tradedate,
-        ua.userid || '/' || t.accountid || '/' || ua.accountname as userfullname,
+        ua.userid || '/' || t.accountid || '/' || ua.accountname as userfullname, g.goodscode,
         g.goodscode || '/' || g.goodsname as goodsfullname,
         case
         when  (ua.usertype = 5 and pua.userid != mua.userid) then  pua.userid || '/' || to_char(pua.accountname)
@@ -1244,7 +1246,7 @@
         SELECT
         '--' as  tradedate,
         g.goodsid,
-        g.goodscode || '/' || g.goodsname as goodsfullname,
+        g.goodscode || '/' || g.goodsname as goodsfullname,g.goodscode,
 
         case
         when (m.trademode=52) then sum(t.tradeqty * g.agreeunit) || en.enumdicname
@@ -1295,7 +1297,7 @@
         SELECT
         t.reckondate as tradedate,
         g.goodsid,
-        g.goodscode || '/' || g.goodsname as goodsfullname,
+        g.goodscode || '/' || g.goodsname as goodsfullname,g.goodscode,
 
         case
         when (m.trademode=52) then sum(t.tradeqty * g.agreeunit) || en.enumdicname

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/accounttransaction/AccountTransactionQueryResult.java

@@ -62,4 +62,6 @@ public class AccountTransactionQueryResult {
     @ColumnWidth(20)
     @ApiModelProperty(value = "总手续费")
     private BigDecimal chargesum;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/commission/CommissionSheetResult.java

@@ -70,4 +70,6 @@ public class CommissionSheetResult {
 
     @ApiModelProperty(value = "查询类型 1历史 0当前")
     private Integer isHis;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/contract/ContractSheetResult.java

@@ -104,4 +104,6 @@ public class ContractSheetResult {
 
     @ApiModelProperty(value = "查询类型 1历史 0当前")
     private Integer ishis;
+
+    private String goodscode;
 }

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

@@ -54,7 +54,7 @@ public class SettlementDealResult {
 
     private Long loginid;
 
-    private Long matchloginid;
+    private String matchloginid;
 
     @ApiModelProperty(value = "卖方")
     private String matchaccountname;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/goodstrade/GoodsTradeQueryResult.java

@@ -47,4 +47,6 @@ public class GoodsTradeQueryResult {
     @ColumnWidth(20)
     @ApiModelProperty(value = "总手续费")
     private BigDecimal chargesum;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/order/DeliveryOrderResult.java

@@ -96,4 +96,6 @@ public class DeliveryOrderResult {
     private Long marketid;
 
     private Long buyorsell;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/order/ForcedOrderResult.java

@@ -95,4 +95,6 @@ public class ForcedOrderResult {
     private Long marketid;
 
     private Integer buyorsell;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/order/OrderDateQueryResult.java

@@ -107,4 +107,6 @@ public class OrderDateQueryResult {
     @ColumnWidth(20)
     @ApiModelProperty(value = "操作人")
     private String operatorcode;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/order/TerOrderQueryResult.java

@@ -93,4 +93,6 @@ public class TerOrderQueryResult {
     @ColumnWidth(20)
     @ApiModelProperty(value = "终止单号")
     private String closeid;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/GoodsReportResult.java

@@ -84,4 +84,6 @@ public class GoodsReportResult {
     private BigDecimal markettradeqty;
 
     private Long marketid;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/ShareAmountQueryResult.java

@@ -51,4 +51,6 @@ public class ShareAmountQueryResult {
     private Long memberuserid;
 
     private Integer tradeproperty;
+
+    private String goodscode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/TradeQueryResult.java

@@ -39,4 +39,6 @@ public class TradeQueryResult {
 
     @ApiModelProperty(value = "转让手续费")
     private BigDecimal closecharge;
+
+    private String goodscode;
 }