Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java

@@ -79,5 +79,5 @@
     */
    List<UserGoodsStorage>  listQueryByIds(List<Long> list);
    
    void updateShareState(@Param("shareId") Long shareId);
    void updateShareStateByCommonGoodsId(@Param("commonGoodsId") Long commonGoodsId);
}

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

@@ -140,9 +140,8 @@
   </select>
   
   
       <update id="updateShareState" parameterType="java.lang.Long">
       <update id="updateShareStateByCommonGoodsId" parameterType="java.lang.Long">
        UPDATE `yeshi_ec_user_goods_storage` ts SET ts.`guc_state` = 1 
        WHERE ts.`guc_common_id` IN
         (SELECT tg.`gu_common_goods_id` FROM yeshi_ec_share_goods_group tg WHERE tg.`gu_record_id` = #{shareId})
          WHERE ts.`guc_common_id` = #{commonGoodsId}
    </update>
</mapper>

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

@@ -132,8 +132,8 @@
    }

    

    @Override

    public void updateShareState(Long shareId) {

        userGoodsStorageMapper.updateShareState(shareId);

    public void updateShareStateByCommonGoodsId(Long commonGoodsId) {

        userGoodsStorageMapper.updateShareStateByCommonGoodsId(commonGoodsId);

    }



    @Override


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

@@ -330,8 +330,6 @@
    }

    

    

	


    /**

     * 保存分享记录

     * 

@@ -808,7 +806,17 @@
        executor.execute(new Runnable() {

            @Override

            public void run() {

                userGoodsStorageService.updateShareState(shareId);

                List<UserShareGoodsGroup> listgoods = userShareGoodsGroupService.listByRecordId(shareId);

                if (listgoods != null && listgoods.size() > 0) {

					
                    for (UserShareGoodsGroup userShareGoodsGroup: listgoods) {

                        CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods();

                        if (commonGoods == null) {

                            continue;

                        }

                        userGoodsStorageService.updateShareStateByCommonGoodsId(commonGoods.getId());

                    }

                } 
            }

        });

    }


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java

@@ -100,6 +100,6 @@
     * 更新商品状态为已分享

     * @param shareId 分享

     */

    public void updateShareState(Long shareId);

    public void updateShareStateByCommonGoodsId(Long shareId);



}