Merge branch 'task-lyh-pay'

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

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

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

@@ -119,7 +119,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Override
     public DownloadOrder insertDownloadOrder(User user, DownNumParam param, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(param.getCount()));
-        PayGoods payGoods = new PayGoods(param.getSceneName() +"场景下载",param.getCount(),param.getSceneNum());
+        PayGoods payGoods = new PayGoods(param.getSceneName() +"场景下载",param.getCount(),param.getSceneNum(),2);
         PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);

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

@@ -161,7 +161,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
-        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount());
+        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount(),incrementType.getValidTimeType());
         PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);

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

@@ -172,7 +172,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());
+            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),orderItemEntity.getGoodsCount(),3);
             goodsInfoList.add(payGoods);
         }