zhijiezhao 6 months ago
parent
commit
f18b4ef262

+ 1 - 0
src/main/java/com/caimei365/commodity/controller/SecondHandApi.java

@@ -102,6 +102,7 @@ public class SecondHandApi {
      *                  ,"authenticationBackImage" : 身份证背面照片
      *                  ,"cardNumber" : 收款卡号
      *                  ,"userId" : userId
+     *                  ,"buyFlag" : 1卖出 2买入
      *                  }
      * @param headers   HttpHeaders
      */

+ 2 - 0
src/main/java/com/caimei365/commodity/model/dto/SecondDto.java

@@ -17,6 +17,8 @@ import java.io.Serializable;
 public class SecondDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private Integer buyFlag;
+
     private Integer userId;
 
     @ApiModelProperty("收款卡号")

+ 1 - 0
src/main/java/com/caimei365/commodity/model/po/ProductSecondPo.java

@@ -16,6 +16,7 @@ import java.util.Date;
 public class ProductSecondPo implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private Integer buyFlag;
     private Integer userId;
 
     /** 主键id */

+ 2 - 0
src/main/java/com/caimei365/commodity/model/vo/SecondDetailVo.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Data
 public class SecondDetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    private Integer buyFlag;
     /**
      * 公司名称
      */

+ 2 - 0
src/main/java/com/caimei365/commodity/model/vo/SecondListVo.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Data
 public class SecondListVo implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    private Integer buyFlag;
     /** 商品productID */
     private Integer productId;
     /** 名称name */

+ 1 - 0
src/main/java/com/caimei365/commodity/service/impl/SecondHandServiceImpl.java

@@ -527,6 +527,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         } else {
             secondPo.setPublisher(secondDto.getContactName());
         }
+        secondPo.setBuyFlag(secondDto.getBuyFlag());
         secondPo.setUserId(secondDto.getUserId());
         secondPo.setSecondHandType(secondDto.getSecondHandType());
         secondPo.setInstrumentType(secondDto.getInstrumentType());

+ 6 - 4
src/main/resources/mapper/SecondHandMapper.xml

@@ -12,7 +12,7 @@
                                           payAmount, payFormData, payType, payDate, submitDate, reviewedDate,
                                           onLineDate, source, publisher, authenticationImage,
                                           fileName, ossName, commitmentImage, publishIdentity, licenseImage,
-                                          authenticationBackImage,userId)
+                                          authenticationBackImage, userId, buyFlag)
         values (#{productId}, #{sold}, #{secondHandType}, #{instrumentType}, #{fixedYears}, #{maturityYears},
                 #{companyName},
                 #{detailTalkFlag}, #{originalPrice}, #{contactName}, #{contactMobile}, #{dockingPeopleName},
@@ -23,7 +23,7 @@
                 #{reviewedDate},
                 #{onLineDate}, #{source}, #{publisher}, #{authenticationImage}, #{fileName}, #{ossName},
                 #{commitmentImage}, #{publishIdentity},
-                #{licenseImage}, #{authenticationBackImage},#{userId})
+                #{licenseImage}, #{authenticationBackImage}, #{userId}, #{buyFlag})
     </insert>
     <insert id="insertProductImage" parameterType="com.caimei365.commodity.model.po.ProductImagePo">
         insert into productimage (productID, shopID, addTime, image, mainFlag, sortIndex)
@@ -76,7 +76,8 @@
         cshd.detailTalkFlag as "detailTalkFlag",
         cshd.onLineDate as "onLineDate",
         cshd.viewingNum as "viewingNum",
-        cshd.provinceCityDistrict as "provinceCityDistrict"
+        cshd.provinceCityDistrict as "provinceCityDistrict",
+        cshd.buyFlag
         from product p
         left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 0
         left join cm_sku cs on p.productID=cs.productId
@@ -133,7 +134,8 @@
                cshd.fixedYears,
                cshd.maturityYears,
                cshd.publishIdentity,
-               cshd.companyName
+               cshd.companyName,
+               cshd.buyFlag
         from product p
                  left join cm_sku cs on p.productID = cs.productId
                  left join cm_second_hand_detail cshd on p.productID = cshd.productID