Merge branch 'feature/1113-vipCourse' into develop-new

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderDetailMapper.xml

@@ -140,7 +140,7 @@
     </select>
 
 	<select id="getActivityGoodsCount" resultType="int">
-        SELECT sum(t.good_num_) as goodNum
+        SELECT ifnull(sum(t.good_num_),0) as goodNum
         FROM user_order_detail t
         left join user_order o on t.order_no_ = o.order_no_
         where o.activity_id_ = #{activityId}