Merge remote-tracking branch 'origin/master'

src/main/java/com/caimei/service/impl/ShoppingCartServiceImpl.java

@@ -104,8 +104,7 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
             // 活动价
             if (activity.getMode() == 1) {
                 product.setRetailPrice(activity.getTouchPrice());
-                BigDecimal reduction = MathUtil.sub(product.getPrice(), activity.getTouchPrice());
-                product.setFullReduction(MathUtil.mul(reduction, product.getProductCount()));
+                product.setFullReduction(BigDecimal.ZERO);
             } else {
                 BigDecimal totalPrice = MathUtil.mul(product.getProductCount(), product.getPrice());
                 if (addTaxFlag) {

src/main/resources/mapper/ProductMapper.xml

@@ -22,7 +22,9 @@
             OR u.userName LIKE CONCAT('%',#{name}, '%')
             )
         </if>
+        ORDER BY u.registerTime DESC
     </select>
+
     <select id="findProductList" resultType="com.caimei.model.vo.ProductVo">
         select
         cop.id as productId,