fix 加购规格重复平台;预下单默认支付宝

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -262,7 +262,7 @@ public class OrderDon extends BaseEntity implements Serializable {
         String desc;
 
         public static Type getType(String type) {
-            return Arrays.stream(Type.values()).filter(tp -> tp.getType().equals(type)).findFirst().orElse(WeChat);
+            return Arrays.stream(Type.values()).filter(tp -> tp.getType().equals(type)).findFirst().orElse(ALI_PAY);
         }
     }
 

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSkuServiceImpl.java

@@ -58,12 +58,12 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
 		Map<Long, GoodsDiscountPlusPurchaseRelation> skuIdMap = new ConcurrentHashMap<>();
 		discountPlusPurchaseGoods.forEach(discountGoods -> {
 			AtomicBoolean is_exist = new AtomicBoolean(false);
-			if (skuIdMap.get(discountGoods.getDisGid()) == null) {
-				skuIdMap.put(discountGoods.getDisGid(), discountGoods);
+			if (skuIdMap.get(discountGoods.getDisSid()) == null) {
+				skuIdMap.put(discountGoods.getDisSid(), discountGoods);
 			}
 			dbDiscountPlusGoodsList.forEach(db_exist->{
 				//存在
-				if (db_exist.getDisGid().equals(discountGoods.getDisGid())) {
+				if (db_exist.getDisSid().equals(discountGoods.getDisSid())) {
 					is_exist.set(true);
 					discountGoods.setId(db_exist.getId());
 					checkPurchaseParamsAndSaveOrUpdate(goodsId, skuId, discountGoods);
@@ -77,7 +77,7 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
 
 		//去除数据库已被删除的
 		dbDiscountPlusGoodsList.forEach(dbDiscountPlusGoods -> {
-			GoodsDiscountPlusPurchaseRelation exists = skuIdMap.get(dbDiscountPlusGoods.getDisGid());
+			GoodsDiscountPlusPurchaseRelation exists = skuIdMap.get(dbDiscountPlusGoods.getDisSid());
 			//不存在
 			if (exists == null) {
 				discountPlusPurchaseRelationMapper.deleteById(dbDiscountPlusGoods.getId());