Merge remote-tracking branch 'origin/master'

admin

2018-12-12 128519ae591052ae5bdb96db55cd65c566238734

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsRecordMapper.xml

@@ -65,7 +65,7 @@
     SELECT * FROM yeshi_ec_share_goods_record
     WHERE sgr_uid = #{uid}
           <if test="source != null and source != '' ">
               sgr_source = = #{source}
              AND sgr_source = #{source}
           </if>    
     ORDER BY sgr_updatetime DESC
     LIMIT #{start},#{count}
@@ -75,7 +75,7 @@
     SELECT IFNULL(count(sgr_id),0) FROM yeshi_ec_share_goods_record 
     WHERE sgr_uid = #{uid}
       <if test="source != null and source != '' ">
               sgr_source = = #{source}
               AND sgr_source = #{source}
       </if>    
   </select>
  

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml

@@ -99,7 +99,7 @@
     SELECT * FROM yeshi_ec_user_goods_storage  tg
     LEFT JOIN  `yeshi_ec_common_goods` cg ON tg.`guc_common_id` = cg.`cg_id`
     WHERE tg.`guc_uid` = #{uid}
     ORDER BY  tg.guc_state,tg.`guc_updatetime` DESC
     ORDER BY  cg.cg_state, tg.guc_state, tg.`guc_updatetime` DESC
     LIMIT #{start},#{count}
   </select>
   

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java

@@ -229,7 +229,7 @@
    @Override

    public FileUploadResult save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {

        

        if (listGoods == null || listGoods.size() <= 1) {

        if (listGoods == null || listGoods.size() < 0) {

            throw new UserShareGoodsRecordException(1, "分享商品数量不足");

        }