二手发布

src/main/java/com/caimei365/commodity/controller/SecondHandApi.java

@@ -97,6 +97,7 @@ public class SecondHandApi {
      *                  (fileType字符串逗号拼接)
      *                  ,"checkCode" : 验证码
      *                  ,"authenticationBackImage" : 身份证背面照片
+     *                  ,"cardNumber" : 收款卡号
      *                  }
      * @param headers   HttpHeaders
      */

src/main/java/com/caimei365/commodity/mapper/ShopMapper.java

@@ -160,5 +160,4 @@ public interface ShopMapper {
      */
     String getShopNameByShopId(Integer shopId);
 
-    String findRealShopName(Integer productId);
 }

src/main/java/com/caimei365/commodity/model/dto/SecondDto.java

@@ -16,7 +16,8 @@ import java.io.Serializable;
 @Data
 public class SecondDto implements Serializable {
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty("收款卡号")
+    private String cardNumber;
     /**
      * 验证码
      */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -585,13 +585,6 @@ public class PageServiceImpl implements PageService {
             }
             shop.setLogo(ImageUtils.getImageURL("shopLogo", shop.getLogo(), 0, domain));
             shop.setBusinessLicense(ImageUtils.getImageURL("shopLogo", shop.getBusinessLicense(), 0, domain));
-            //如果是综合供应商，填写了真实供应商的把shopname设为真实供应商
-            if(1161==shop.getShopId()){
-                String realShopName=shopMapper.findRealShopName(productId);
-                if(StringUtils.isNotBlank(realShopName)){
-                    shop.setName(realShopName);
-                }
-        }
             product.setShop(shop);
         }
         // 商品可见度：3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见

src/main/java/com/caimei365/commodity/service/impl/SecondHandServiceImpl.java

@@ -163,7 +163,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         // 初始商品分类
         String typeStr = "";
         Integer secondHandType = second.getSecondHandType();
-        if (1 == secondHandType){
+        if (1 == secondHandType) {
             typeStr += "二手仪器";
         } else if (2 == secondHandType) {
             typeStr += "临期产品";
@@ -210,6 +210,7 @@ public class SecondHandServiceImpl implements SecondHandService {
      *                  (fileType字符串逗号拼接)
      *                  ,"checkCode" : 验证码
      *                  ,"authenticationBackImage" : 身份证背面照片
+     *                  ,"cardNumber" : 收款卡号
      *                  }
      * @param headers   HttpHeaders
      */
@@ -269,6 +270,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         String source = secondDto.getSource();
         Integer townId = secondDto.getTownId();
         String address = secondDto.getAddress();
+        String cardNumber = secondDto.getCardNumber();
         // 此图片为逗号隔开的多张数据
         String image = secondDto.getImage();
         String maturityYears = secondDto.getMaturityYears();
@@ -287,7 +289,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         if (StringUtils.isEmpty(secondHandType)) {
             return ResponseJson.error("参数异常：请选择分类");
         } else if (StringUtils.equals("1", secondHandType)) {
-            if (null==instrumentType) {
+            if (null == instrumentType) {
                 return ResponseJson.error("参数异常：请完善仪器分类");
             }
         } else if (StringUtils.equals("2", secondHandType)) {
@@ -332,6 +334,9 @@ public class SecondHandServiceImpl implements SecondHandService {
         if (StringUtils.isEmpty(source)) {
             return ResponseJson.error("参数异常：请输入发布来源");
         }
+        if (StringUtils.isBlank(cardNumber)) {
+            return ResponseJson.error("参数异常：请输入收款卡号");
+        }
         // 保存二手商品
         return saveSecondHandProduct(secondDto);
     }

src/main/resources/mapper/ShopMapper.xml

@@ -553,7 +553,4 @@
     <select id="getShopNameByShopId" resultType="java.lang.String">
         select name from shop where shopID = #{shopId}
     </select>
-    <select id="findRealShopName" resultType="java.lang.String">
-        select realShopName from product where productID = #{productId}
-    </select>
 </mapper>