分销系统V.1.0.0

src/main/java/com/caimei/modules/user/web/CmDistributionController.java

@@ -15,7 +15,9 @@ import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.sys.utils.ValidateUtils;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.service.CmUserService;
+import com.caimei.modules.utils.DateUtil;
 import com.caimei.utils.AppKeys;
+import com.caimei.utils.CodeUtil;
 import com.caimei.utils.DateUtils;
 import com.caimei.utils.MD5Utils;
 import com.google.common.collect.Maps;
@@ -137,7 +139,7 @@ public class CmDistributionController extends BaseController {
         cmUser.setAuditTime(DateUtils.getDateTime());
         cmUser.setValidFlag(cmDistribution.status()==90?"1":"0");
         if (StringUtils.isBlank(cmDistribution.getId())) {
-            String password="1111aaaa";
+            String password=(char)(Math.random()*26+'A')+ DateUtil.generateCodeInt(7);
             cmUser.setUserOrganizeID(0);
             cmUser.setUserIdentity(7);//外部协销
             cmUser.setRegisterUserTypeID(com.caimei.constants.UserType.SERVICEEMPLOYEE.getCode() + "");

src/main/java/com/caimei/modules/user/web/CmReportingClubController.java

@@ -188,7 +188,7 @@ public class CmReportingClubController extends BaseController
         Double cmReportingMembercCommissions = cmReportingClubService.getCmReportingMembercCommissions(new CmReportingMember()
                 .clubReportingId(cmReportingMember.clubReportingId()));
         CmReportingClub cmReportingClub = new CmReportingClub()
-                .id(cmReportingMember.id())
+                .id(String.valueOf(cmReportingMember.clubReportingId()))
                 .paidCommission(new BigDecimal(cmReportingMembercCommissions));
         if (cmReportingMemberCount == 0) {
             cmReportingClub.settleStatus(1);

src/main/java/com/caimei/modules/utils/DateUtil.java

@@ -4,11 +4,24 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Random;
 
 public class DateUtil {
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
     private static Calendar calendar = Calendar.getInstance();
+    private static char intSequence[] = {
+            '2', '3', '4', '5', '6', '7',
+            '8', '9'
+    };
 
+    public static String generateCodeInt(int length) {
+        StringBuffer sb = new StringBuffer();
+        Random random = new Random();
+        for (int i = 0; i < intSequence.length && i < length; ++i) {
+            sb.append(intSequence[random.nextInt(intSequence.length)]);
+        }
+        return sb.toString();
+    }
     /*
     输入日期字符串比如201703，返回当月第一天的Date
     */
@@ -59,4 +72,4 @@ public class DateUtil {
 //    }
 
 
-}
+}

src/main/resources/mappings/modules/user/CmDistributionMapper.xml

@@ -157,7 +157,7 @@
 			<if test="addTime != null "> and cm_distribution.addTime = #{addTime}</if>
 			<if test="settleStatus != null ">
 				<if test="settleStatus == 1 ">
-					and (SELECT ifnull(sum(IFNULL(cop.organizeCostPrice,cop.price*cop.organizePercent)),0)
+					and (SELECT ifnull(sum(IFNULL(cop.organizeCostPrice*cop.num,cop.price*cop.organizePercent*cop.num)),0)
 					from cm_reporting_club a
 					left join cm_distribution  cd on cd.id = a.distributionId
 					left join cm_order  co on co.orderID = a.orderID
@@ -169,7 +169,7 @@
 					)=0
 				</if>
 				<if test="settleStatus == 0 ">
-					and (SELECT ifnull(sum(IFNULL(cop.organizeCostPrice,cop.price*cop.organizePercent)),0)
+					and (SELECT ifnull(sum(IFNULL(cop.organizeCostPrice*cop.num,cop.price*cop.organizePercent*cop.num)),0)
 					from cm_reporting_club a
 					left join cm_distribution  cd on cd.id = a.distributionId
 					left join cm_order  co on co.orderID = a.orderID
@@ -245,7 +245,7 @@
 	</select>
 
 	<select id="getByCommissions"  resultType="bigDecimal">
-		SELECT ifnull(sum(IFNULL(cop.organizeCostPrice,cop.price*cop.organizePercent)),0)
+		SELECT ifnull(sum(IFNULL(cop.organizeCostPrice*cop.num,cop.price*cop.organizePercent*cop.num)),0)
 		from cm_reporting_club a
 				 left join cm_distribution  cd on cd.id = a.distributionId
 				 left join cm_order  co on co.orderID = a.orderID

src/main/resources/mappings/modules/user/CmReportingClubMapper.xml

@@ -159,7 +159,7 @@
 	</select>
 	<select id="getCmReportingClubList" parameterType="com.caimei.modules.user.entity.CmReportingClub" resultType="com.caimei.modules.user.entity.CmReportingClub">
 		<include refid="selectCmReportingClubVo"/>,
-		cdr.payWay,cso.orderTime,IFNULL(cop.organizeCostPrice,cop.price*cop.organizePercent) as organizeCostPrice
+		cdr.payWay,cso.orderTime,IFNULL(cop.organizeCostPrice*cop.num,cop.price*cop.organizePercent*cop.num) as organizeCostPrice
 		from cm_reporting_club AS cm_reporting_club
 		LEFT JOIN cm_distribution_product AS cm_distribution_product  on cm_reporting_club.productId=cm_distribution_product.productId
 		LEFT JOIN product p ON  cm_distribution_product.productId = p.productID

src/main/webapp/WEB-INF/views/modules/user/cmDistributionFrom.jsp

@@ -12,7 +12,7 @@
 					$.post("${ctx}/new/user/agency/findUserIsMobile", {
 						'mobile': $("#mobile").val(),
 						'oldUserId': $("#userId").val(),
-						'userIdentity': 7
+						// 'userIdentity': 7
 					}, function (data) {
 						console.log(data)
 						if (false == data.success) {