Merge branch 'master' into pre

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -126,6 +126,9 @@ public interface Constant {
 
 	String NEW_APPID_NO_COUNTRY_SECRET = "朋友 %s 工作 %s 父母 %s";
 
+	//含生日
+	String NEW_APPID_NO_COUNTRY_SECRET_DATE = "%s 朋友 %s 工作 %s 父母 %s";
+
 	String ACCOUNT_DOUBLE_VERIFY_KEY = "account_double_verify_key";
 
 	/**

netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -366,7 +366,15 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 								}
 								insert.setSecret(string);
 							} else {
-								insert.setSecret(Constant.AMERICA_APPID_SECRET);
+								//密保
+								if (part.length > 5) {
+									String friends = part[2];
+									String works = part[3];
+									String parents = part[4];
+									String birthday = part[5];
+									String secret = String.format(Constant.NEW_APPID_NO_COUNTRY_SECRET_DATE, birthday, friends, works, parents);
+									insert.setSecret(secret);
+								}
 							}
 						}
 					}

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -1216,11 +1216,11 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             orderDon.setRefundMoney(orderRefundMoney.add(refundMoney));
             orderDonMapper.updateById(orderDon);
 
-            //补差价金额 扣除对应分销提成金额
-            orderDon.setRefundMoney(refundMoney);
-            deductDsPoints(orderDon);
-            //店铺分销提成金额扣除
-            yhShopDistributeService.deductDsMoney(orderDon);
+//            //补差价金额 扣除对应分销提成金额
+//            orderDon.setRefundMoney(refundMoney);
+//            deductDsPoints(orderDon);
+//            //店铺分销提成金额扣除
+//            yhShopDistributeService.deductDsMoney(orderDon);
 
         } else {
             BigDecimal refundBalance = refundMoney;