Merge branch 'task-lyh-inctype2' into test

src/main/java/com/fdkankan/ucenter/httpClient/param/PayGoods.java

@@ -10,9 +10,11 @@ public class PayGoods {
     private Integer type;   //0专业会员，1高级会员，2下载，3配件
     private Integer goodsId;
     private Integer monthQy = 1;
+    private String nameEn;
 
-    public PayGoods(String name, Integer count,Integer type) {
+    public PayGoods(String name, String nameEn,Integer count,Integer type) {
         this.name = name;
+        this.nameEn = nameEn;
         this.count = count;
         this.type = type;
     }

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -174,7 +174,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             orderItemEntities.add(orderItemEntity);
 
             goodsAmount = goodsAmount.add(orderItemEntity.getGoodsPrice().multiply(new BigDecimal(orderItemEntity.getGoodsCount())));
-            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),orderItemEntity.getGoodsCount(),3);
+            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),responseGoods.getNameEn(),orderItemEntity.getGoodsCount(),3);
             goodsInfoList.add(payGoods);
         }
 

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -96,7 +96,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(cameraIdList!=null ){
             queryWrapper.in(UserIncrement::getCameraId,cameraIdList);
         }
-        queryWrapper.orderByDesc(UserIncrement::getCreateTime);
+        queryWrapper.orderByDesc(UserIncrement::getId);
         Page<UserIncrement> pageEntity = this.page(page, queryWrapper);
 
         List<UserIncrementVo> responseList = convert(pageEntity.getRecords());