小版本bug提交

pom.xml

@@ -733,6 +733,18 @@
 			<version>3.6</version>
 		</dependency>
 
+		<!--spring AOP的包-->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+			<version>4.3.7.RELEASE</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>4.3.7.RELEASE</version>
+		</dependency>
 		<!--
         Optional dependency. Needed only if you deploy `ImageIO` plugins as part of a web app.
         Make sure you add the `IIOProviderContextListener` to your `web.xml`, see above.

src/main/java/com/caimei/modules/newhome/web/AnnouncementController.java

@@ -56,9 +56,11 @@ public class AnnouncementController extends BaseController {
         return "modules/newhome/announcementForm";
     }
 
+
     @RequiresPermissions("newhome:announcementForm:view")
     @RequestMapping(value = "save")
     public String save(Announcementmanagement announcementmanagement, Model model) {
+        logger.info("*************用户id"+id);
         if (id != null) {
             announcementmanagement.setId(id);
             announcementService.update(announcementmanagement);

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.dao;
 
+import com.caimei.modules.order.entity.CmPayShop;
 import com.caimei.modules.order.entity.NewShopOrder;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
@@ -16,6 +17,8 @@ import java.util.List;
 @MyBatisDao
 public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
+    Double promotionFull(CmPayShop cmPayShop);
+
     String getProductOrder(Integer orderid);
 
     List<String> getOpenidListByPermission(@Param("userid")Integer userid,@Param("unionid") String unionid);

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -64,6 +64,13 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
     @Resource
     private CmRefundShopDao cmRefundShopDao;
 
+
+//获取主订单满减数据
+    public Double promotionFull(CmPayShop cmPayShop){
+
+        return newShopOrderDao.promotionFull(cmPayShop);
+    }
+
     public List<CmPayShop> exports(Page<CmPayShop> cmPayShopPage, CmPayShop cmPayShop) {
         Page<CmPayShop> result = super.findPage(cmPayShopPage, cmPayShop);
         List<CmPayShop> list = result.getList();
@@ -264,6 +271,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 //主订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
+                //主订单满减活动
+                so.setPromotionFullReduction(newOrder.getPromotionFullReduction());
             }
             cmPayShop.setTotalAmount(totalAmount);
             cmPayShop.setBalancePayFee(0D);
@@ -350,6 +359,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 //主订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
+                //主订单满减活动
+                so.setPromotionFullReduction(newOrder.getPromotionFullReduction());
             }
             cmPayShop.setShopOrders(csos);
         }

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -586,8 +586,12 @@ public class CmPayShopController extends BaseController {
     @RequestMapping("applyEdit")
     public String applyEdit(CmPayShop cmPayShop, String[] shopOrderIDs, Model model) {
         try {
+            Double promotionFull=cmPayShopService.promotionFull(cmPayShop);
+
             cmPayShopService.applyEdit(cmPayShop, shopOrderIDs);
+
             model.addAttribute("cmPayShop", cmPayShop);
+            model.addAttribute("promotionFull", promotionFull);
         } catch (Exception e) {
             logger.info(e.getMessage());
             e.printStackTrace();

src/main/java/com/caimei/modules/user/aop/OperationLogAspect.java

@@ -16,7 +16,8 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -28,6 +29,7 @@ import java.util.List;
 @Aspect
 @Component
 public class OperationLogAspect {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private SysLogService sysLogService;
 
@@ -75,6 +77,7 @@ public class OperationLogAspect {
         String jgname = request.getParameter("name");//修改后机构名字
         String sname = request.getParameter("sname");//修改后机构简称
         String uname = request.getParameter("userName");//修改后的联系人
+        String linkMan = request.getParameter("linkMan");//修改后的联系人
         String Identity = request.getParameter("linkManIdentity");//联系人身份
         String address = request.getParameter("address");//详细地址
         String socialCreditCode = request.getParameter("socialCreditCode");//营业执照编号
@@ -101,12 +104,109 @@ public class OperationLogAspect {
         String highestAchievement = request.getParameter("highestAchievement");//最高业绩
         String reachPepole = request.getParameter("reachPepole");//到店人数
         String clinchPepole = request.getParameter("clinchPepole");//成交人数
+        String shortName = request.getParameter("shortName");//成交人数
         String methodName = myLog.operModul();
         ArrayList<String> list = new ArrayList();
 
-        if (myLog.operType().equals("编辑")) {
-            if (A.cmClu.getHighestAchievement().equals("") || A.cmClu.getReachPepole() == null || A.cmClu.getClinchPepole() == null) {
-                if (!highestAchievement.equals("") || !reachPepole.equals("") || !clinchPepole.equals("")) {
+        //*
+        // 未确认机构编辑
+        // */
+        if("1".equals(myLog.oper())&& "编辑".equals(myLog.operType())){
+
+                if (B.clubT.getLinkMan() != "") {
+                    sysLog.setContact(B.clubT.getLinkMan());
+            }
+
+            if (B.clubT.getLinkMan() == null) {
+                if (linkMan != null) {
+                    list.add("新增了联系人");
+                }
+            }
+            if (!B.clubT.getLinkMan().equals(linkMan)) {
+                list.add("修改了联系人");
+            }
+            if (B.clubT.getShortName() == null) {
+                if (shortName != null) {
+                    list.add("新增了机构简称");
+                }
+            }
+            if (!B.clubT.getShortName().equals(shortName)) {
+                list.add("修改了机构简称");
+            }
+
+            if (B.clubT.getName() == null) {
+                if (jgname != null) {
+                    list.add("新增了机构名称");
+                }
+            }
+            if (!B.clubT.getName().equals(jgname)) {
+                list.add("修改了机构名称");
+            }
+
+            if (B.clubT.getBindMobile() == null) {
+                if (bindm != null) {
+                    list.add("新增了手机号");
+                }
+            }
+            if (!B.clubT.getBindMobile().equals(bindm)) {
+                list.add("修改了手机号");
+            }
+
+            if (B.clubT.getContractEmail() == null) {
+                if (email != null) {
+                    list.add("新增邮箱");
+                }
+            }
+            if (!B.clubT.getContractEmail().equals(email)) {
+                list.add("修改了邮箱");
+            }
+            if (!B.clubT.getAddress().equals(address)) {
+                list.add("修改了详细地址");
+            }
+            if (B.clubT.getBusinessLicense() == null) {
+                if (businessLicenseImage != null) {
+                    list.add("新增了营业执照");
+                }
+            } else {
+                if (!B.clubT.getBusinessLicense().equals(businessLicenseImage)) {
+                    list.add("修改了营业执照");
+                }
+            }
+
+            if (B.clubT.getShopPhoto() == null) {
+                if (headpic != null) {
+                    list.add("新增了门头照");
+                }
+                if (!B.clubT.getShopPhoto().equals(headpic)) {
+                    list.add("修改了门头照");
+                }
+            }
+
+
+            if (B.clubT.getSocialCreditCode() == null) {
+                if (socialCreditCode != null) {
+                    list.add("新增了营业执照编号");
+                }
+                if (!B.clubT.getSocialCreditCode().equals(socialCreditCode)) {
+                    list.add("修改了营业执照编号");
+                }
+            }
+            if (B.clubT.getFirstClubType() == null) {
+                if (ClubType != null) {
+                    list.add("新增了机构类型");
+                }
+            } else if (!B.clubT.getFirstClubType().equals(ClubType)) {
+                list.add("修改了机构类型");
+            }
+
+        }
+
+
+
+        if ("编辑".equals(myLog.operType())&& "2".equals(myLog.oper()) ) {
+            logger.info(A.cmClu.getHighestAchievement()+"*****"+A.cmClu.getReachPepole()+"*****"+A.cmClu.getClinchPepole());
+            if ("".equals(A.cmClu.getHighestAchievement()) || A.cmClu.getReachPepole() == null || A.cmClu.getClinchPepole() == null) {
+                if (!"".equals(highestAchievement) || !"".equals(reachPepole) || !"".equals(clinchPepole)) {
                     list.add("新增了活动业绩信息");
                 }
 
@@ -145,7 +245,7 @@ public class OperationLogAspect {
 
 
             if (A.cmClu.getCateA() == null || A.cmClu.getCateB() == null || A.cmClu.getCateC() == null) {
-                if (!cateA.equals("") || !cateB.equals("") || !cateC.equals("")) {
+                if (!"".equals(cateA) || !"".equals(cateB) || !"".equals(cateC)) {
                     list.add("新增了会员信息");
                 }
             } else {
@@ -161,8 +261,8 @@ public class OperationLogAspect {
             }
 
 
-            if (A.cmClu.getMonthAchievement().equals("") || A.cmClu.getPromotionAchievement().equals("") || A.cmClu.getYearAchievement().equals("")) {
-                if (!monthAchievement.equals("") || !promotionAchievement.equals("") || !yearAchievement.equals("")) {
+            if ("".equals(A.cmClu.getMonthAchievement()) || "".equals(A.cmClu.getPromotionAchievement()) || "".equals(A.cmClu.getYearAchievement())) {
+                if (!"".equals(monthAchievement) || !"".equals(promotionAchievement) || !"".equals(yearAchievement)) {
                     list.add("新增了业绩信息");
                 }
 
@@ -181,7 +281,7 @@ public class OperationLogAspect {
 
 
             if (A.cmClu.getArea() == null || A.cmClu.getBedNums() == null || A.cmClu.getBeauticians() == null) {
-                if (!area.equals("") || !bedNums.equals("") || !beauticians.equals("")) {
+                if (!"".equals(area) || !"".equals(bedNums) || !"".equals(beauticians)) {
                     list.add("更新了基本信息");
                 }
             } else {
@@ -198,7 +298,7 @@ public class OperationLogAspect {
 
 
             if (A.newCm.getInfo() == null) {
-                if (!info.equals("")) {
+                if (!"".equals(info)) {
                     list.add("新增了公司简介");
                 }
             } else if (!A.newCm.getInfo().equals(info)) {
@@ -210,7 +310,7 @@ public class OperationLogAspect {
             }
 
             if (A.newCm.getFax() == null) {
-                if (!fax.equals("")) {
+                if (!"".equals(fax)) {
                     list.add("新增了传真");
                 }
             } else if (!A.newCm.getFax().equals(fax)) {
@@ -219,7 +319,7 @@ public class OperationLogAspect {
 
 
             if (A.newCm.getContractPhone() == null) {
-                if (!contractPhone.equals("")) {
+                if (!"".equals(contractPhone)) {
                     list.add("新增了固定电话");
                 }
             } else if (!A.newCm.getContractPhone().equals(contractPhone)) {
@@ -244,9 +344,6 @@ public class OperationLogAspect {
                 list.add("修改了联系人");
             }
 
-            if (!A.newCm.getMainpro().equals(mainpro)) {
-                list.add("更改了主营业务");
-            }
 
             if (A.newCm.getFirstClubType() == null) {
                 if (ClubType != null) {
@@ -346,21 +443,17 @@ public class OperationLogAspect {
 
         //获取机构名称和联系人
         String id = request.getParameter("id");
-        if (myLog.operType().equals("编辑")) {
+        if ("编辑".equals(myLog.operType())) {
             sysLog.setInstitutionName(jgname);
             sysLog.setContact(uname);
         }
-        if (myLog.oper().equals("1")) {
-            if (B.clubT.getLinkMan() != "") {
-                sysLog.setContact(B.clubT.getLinkMan());
-            }
-        }
 
 
-        if (myLog.operType().equals("更换协销")) {
+
+        if ("更换协销".equals(myLog.operType())) {
             System.out.println("更换协销" + A.newCms.getLinkMan());
             System.out.println("更换协销" + A.newCm.getLinkMan());
-            if (!A.newCms.getLinkMan().equals("")) {
+            if (!"".equals(A.newCms.getLinkMan())) {
                 sysLog.setActioncontent(A.newCm.getLinkMan() + "更换为" + A.newCms.getLinkMan());
             }
             sysLog.setContact(A.newCm.getUserName());
@@ -368,9 +461,9 @@ public class OperationLogAspect {
         }
 
 
-        if (myLog.operType().equals("设置机构类别")) {
+        if ("设置机构类别".equals(myLog.operType())) {
             System.out.println("机构类别" + A.types);
-            if (A.types.equals("1")) {
+            if ("1".equals(A.types)) {
                 sysLog.setActioncontent("设置为资质机构");
             } else {
                 sysLog.setActioncontent("设置为个人机构");
@@ -380,7 +473,7 @@ public class OperationLogAspect {
         }
 
 
-        if (myLog.operType().equals("审核")) {
+        if ("审核".equals(myLog.operType())) {
             System.out.println("审核" + A.cmUs.getAuditStatus());
             if (StringUtils.equals("1", A.cmUs.getAuditStatus())) {
                 sysLog.setActioncontent("审核通过");
@@ -392,20 +485,20 @@ public class OperationLogAspect {
         }
 
 
-        if (myLog.operType().equals("更改状态")) {
+        if ("更改状态".equals(myLog.operType())) {
             sysLog.setContact(A.cmUs.getUserName());
             sysLog.setInstitutionName(A.cmUs.getName());
         }
 
 
-        if (myLog.operType().equals("修改密码")) {
+        if ("修改密码".equals(myLog.operType())) {
             String Inst = A.cmUs.getName();
             String Contact = A.cmUs.getUserName();
             sysLog.setContact(Contact);
             sysLog.setInstitutionName(Inst);
         }
 
-        if (myLog.operType().equals("确认注册")) {
+        if ("确认注册".equals(myLog.operType())) {
             sysLog.setActioncontent(methodName);
             ClubTemporary club = clubTemporaryService.get(id);
             if (club != null) {
@@ -418,12 +511,12 @@ public class OperationLogAspect {
         }
 
         //调用service保存SysLog实体类到数据库
-        if (!sysLog.getActioncontent().equals("")) {
-            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+        if (!"".equals(sysLog.getActioncontent())) {
+//            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
                 int i = sysLogService.insert(sysLog);
                 list.removeAll(list);
             }
         }
-    }
+//    }
 
 }

src/main/java/com/caimei/modules/user/aop/OperationLogCmShop.java

@@ -16,6 +16,9 @@ import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -29,7 +32,7 @@ import java.util.Date;
 @Component
 public class OperationLogCmShop {
 
-
+    protected Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private CmOperationalLogService sysLogService;
 
@@ -170,6 +173,7 @@ public class OperationLogCmShop {
                 }
             }
             if (registeredCapital != "") {
+                    logger.info("***********"+A.newcm.getRegisteredCapital()+"+++++++++++++"+ Double.parseDouble(registeredCapital));
                 if (A.newcm.getRegisteredCapital() != Double.parseDouble(registeredCapital)) {
                     list.add("修改了注册资本");
                 }
@@ -304,11 +308,9 @@ public class OperationLogCmShop {
 
 
         System.out.println(sysLog.getInstitutionName());
-        if (!sysLog.getActioncontent().equals("")) {
-            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+        if (!"".equals(sysLog.getActioncontent())) {
                 int i = sysLogService.insert(sysLog);
                 list.removeAll(list);
-            }
         }
     }
 }

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

@@ -93,6 +93,7 @@ public class NewCmShopController extends BaseController {
         }
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         newcm = newCmShop;
+        logger.info("******输出page"+page.getList()+"*****"+newCmShop.getSname());
         model.addAttribute("page", page);
         return "modules/user/newCmShopList";
     }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -335,7 +335,7 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "save")
-    @OperationLogAnnotation(operType = "编辑")
+    @OperationLogAnnotation(operType = "编辑" ,oper = "2")
     @RequiresPermissions("user:newCmClub:edit")
     public String save(NewCmClub newCmClub, CmClubinfo cmClubinfo, Model model, RedirectAttributes redirectAttributes) {
         String name = cmClubinfo.getName();

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -806,6 +806,7 @@
     <select id="findPayOrderListByIDs" resultType="newShopOrder">
         select distinct<include refid="shopOrderColumns"/>,
         co.payTotalFee AS payTotalFee,
+        co.promotionFullReduction,
         bou.name AS buyer,
         s.name AS shopName
         from cm_shop_order a
@@ -874,6 +875,7 @@
     <select id="findByShopOrderIDs" resultType="newShopOrder">
         select distinct<include refid="shopOrderColumns"/>,
         co.payTotalFee AS payTotalFee,
+        co.promotionFullReduction AS promotionFullReduction,
         bou.name AS buyer,
         s.name AS shopName,
         c.name AS clubName
@@ -959,7 +961,7 @@
         SELECT CONCAT(shopOrderNo, '（', shopOrderID, '）') AS result
         FROM cm_shop_order
         WHERE orderID = #{orderID}
-        and shopId != 998
+          and shopId != 998
     </select>
     <select id="findIncome" resultType="java.lang.Double">
         SELECT ROUND(IFNULL((
@@ -1005,92 +1007,90 @@
         WHERE shopOrderID = #{shopOrderId}
     </update>
 
-    <select  id="findSplitList" resultType="newShopOrder">
-        SELECT
-            co.couponAmount AS couponAmount,
-            co.userBeans AS userBeans,
-            a.shopOrderID AS shopOrderID,
-            a.orderID AS orderID,
-            a.organizeID AS organizeID,
-            a.shopOrderNo AS  shopOrderNo,
-            a.orderNo AS  orderNo,
-            a.userID  AS userID,
-            a.shopID  AS shopID,
-            a.itemCount  AS itemCount,
-            a.townID  AS townID,
-            a.productAmount  AS productAmount,
-            a.discountAmount AS  discountAmount,
-            a.accountAmount AS  accountAmount,
-            a.totalAmount AS  totalAmount,
-            a.payFlag  AS payFlag,
-            a.payTime  AS payTime,
-            a.finishTime AS finishTime,
-            a.refundStatus AS  refundStatus,
-            a.needPayAmount AS  needPayAmount,
-            a.canRefundAmount AS  canRefundAmount,
-            a.refundAmount AS  refundAmount,
-            a.clubID  AS clubID,
-            a.spID AS  spID,
-            a.mainSpID  AS mainSpID,
-            a.orderBeanAmount AS  orderBeanAmount,
-            a.useBeanAmount AS  useBeanAmount,
-            a.useBeanFlag AS  useBeanFlag,
-            a.canRefundFlag AS  canRefundFlag,
-            a.useBalanceFlag  AS useBalanceFlag,
-            a.canRefundBeans AS  canRefundBeans,
-            a.freePostageFee AS  freePostageFee,
-            a.freePostageTicketID  AS freePostageTicketID,
-            a.brokerage  AS brokerage,
-            a.delFlag  AS delFlag,
-            a.refundsAmount  AS refundsAmount,
-            a.orderStatusFlag  AS orderStatusFlag,
-            a.buyStatus AS buyStatus,
-            a.orderSubmitType AS orderSubmitType,
-            a.orderType AS orderType,
-            a.orderTime AS orderTime,
-            a.deliveryTimeMills AS deliveryTimeMills,
-            a.presentNum AS presentNum,
-            a.preferential AS preferential,
-            a.outStoreNum AS outStoreNum,
-            IFNULL(a.outStoreTimes, 0) AS outStoreTimes,
-            a.splitFlag AS splitFlag,
-            a.autoReceiveTimeMills AS autoReceiveTimeMills,
-            a.autoOverTimeMills AS autoOverTimeMills,
-            a.receiveGoodsTime AS receiveGoodsTime,
-            a.totalAddedValueTax AS totalAddedValueTax,
-            a.note AS note,
-            a.payStatus AS payStatus,
-            a.sendOutStatus AS sendOutStatus,
-            a.shopProductAmount AS shopProductAmount,
-            a.shopPostFee AS shopPostFee,
-            a.shopTaxFee AS shopTaxFee,
-            a.shouldPayShopAmount AS shouldPayShopAmount,
-            a.payedShopAmount AS payedShopAmount,
-            a.shopOtherFee AS shopOtherFee,
-            a.paying AS paying,
-            a.costType AS costType,
-            a.modifyShouldPayNote AS modifyShouldPayNote,
-            a.orderPromotionsId AS orderPromotionsId,
-            a.differenceType AS differenceType,
-            a.differencePrice AS differencePrice,
-            a.proportional AS proportional,
-            a.promotionFullReduction AS promotionFullReduction,
-            a.zeroCostFlag AS zeroCostFlag,
-            co.payTotalFee AS payTotalFee,
-            co.status AS STATUS,
-            bou.name AS buyer,
-            s.name AS shopName,
-            c.name AS clubName
+    <select id="findSplitList" resultType="newShopOrder">
+        SELECT co.couponAmount            AS couponAmount,
+               co.userBeans               AS userBeans,
+               a.shopOrderID              AS shopOrderID,
+               a.orderID                  AS orderID,
+               a.organizeID               AS organizeID,
+               a.shopOrderNo              AS shopOrderNo,
+               a.orderNo                  AS orderNo,
+               a.userID                   AS userID,
+               a.shopID                   AS shopID,
+               a.itemCount                AS itemCount,
+               a.townID                   AS townID,
+               a.productAmount            AS productAmount,
+               a.discountAmount           AS discountAmount,
+               a.accountAmount            AS accountAmount,
+               a.totalAmount              AS totalAmount,
+               a.payFlag                  AS payFlag,
+               a.payTime                  AS payTime,
+               a.finishTime               AS finishTime,
+               a.refundStatus             AS refundStatus,
+               a.needPayAmount            AS needPayAmount,
+               a.canRefundAmount          AS canRefundAmount,
+               a.refundAmount             AS refundAmount,
+               a.clubID                   AS clubID,
+               a.spID                     AS spID,
+               a.mainSpID                 AS mainSpID,
+               a.orderBeanAmount          AS orderBeanAmount,
+               a.useBeanAmount            AS useBeanAmount,
+               a.useBeanFlag              AS useBeanFlag,
+               a.canRefundFlag            AS canRefundFlag,
+               a.useBalanceFlag           AS useBalanceFlag,
+               a.canRefundBeans           AS canRefundBeans,
+               a.freePostageFee           AS freePostageFee,
+               a.freePostageTicketID      AS freePostageTicketID,
+               a.brokerage                AS brokerage,
+               a.delFlag                  AS delFlag,
+               a.refundsAmount            AS refundsAmount,
+               a.orderStatusFlag          AS orderStatusFlag,
+               a.buyStatus                AS buyStatus,
+               a.orderSubmitType          AS orderSubmitType,
+               a.orderType                AS orderType,
+               a.orderTime                AS orderTime,
+               a.deliveryTimeMills        AS deliveryTimeMills,
+               a.presentNum               AS presentNum,
+               a.preferential             AS preferential,
+               a.outStoreNum              AS outStoreNum,
+               IFNULL(a.outStoreTimes, 0) AS outStoreTimes,
+               a.splitFlag                AS splitFlag,
+               a.autoReceiveTimeMills     AS autoReceiveTimeMills,
+               a.autoOverTimeMills        AS autoOverTimeMills,
+               a.receiveGoodsTime         AS receiveGoodsTime,
+               a.totalAddedValueTax       AS totalAddedValueTax,
+               a.note                     AS note,
+               a.payStatus                AS payStatus,
+               a.sendOutStatus            AS sendOutStatus,
+               a.shopProductAmount        AS shopProductAmount,
+               a.shopPostFee              AS shopPostFee,
+               a.shopTaxFee               AS shopTaxFee,
+               a.shouldPayShopAmount      AS shouldPayShopAmount,
+               a.payedShopAmount          AS payedShopAmount,
+               a.shopOtherFee             AS shopOtherFee,
+               a.paying                   AS paying,
+               a.costType                 AS costType,
+               a.modifyShouldPayNote      AS modifyShouldPayNote,
+               a.orderPromotionsId        AS orderPromotionsId,
+               a.differenceType           AS differenceType,
+               a.differencePrice          AS differencePrice,
+               a.proportional             AS proportional,
+               a.promotionFullReduction   AS promotionFullReduction,
+               a.zeroCostFlag             AS zeroCostFlag,
+               co.payTotalFee             AS payTotalFee,
+               co.status                  AS STATUS,
+               bou.name                   AS buyer,
+               s.name                     AS shopName,
+               c.name                     AS clubName
         FROM cm_shop_order a
-        LEFT JOIN cm_pay_shop_record cpsr ON a.shopOrderID = cpsr.shopOrderID
-        LEFT JOIN bp_order_userinfo bou ON bou.orderId = a.orderID
-        LEFT JOIN cm_order co ON co.orderID = a.orderID
-        LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
-        LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        LEFT JOIN shop s ON s.shopID = a.shopID
-        LEFT JOIN club c ON c.userID = a.userID
-        WHERE
-            co.organizeID = 0
+                 LEFT JOIN cm_pay_shop_record cpsr ON a.shopOrderID = cpsr.shopOrderID
+                 LEFT JOIN bp_order_userinfo bou ON bou.orderId = a.orderID
+                 LEFT JOIN cm_order co ON co.orderID = a.orderID
+                 LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
+                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+                 LEFT JOIN shop s ON s.shopID = a.shopID
+                 LEFT JOIN club c ON c.userID = a.userID
+        WHERE co.organizeID = 0
           AND co.orderType != 2
           AND co.refundType != 2
           AND co.delFlag = 0
@@ -1103,25 +1103,41 @@
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0
           AND co.orderID NOT IN (
-            SELECT orderID FROM cm_order_product WHERE productID IN
-                                                       (6060, 6061, 6062, 6063, 6064, 6065, 6066, 6067, 6068, 6069) GROUP BY orderID
+            SELECT orderID
+            FROM cm_order_product
+            WHERE productID IN
+                  (6060, 6061, 6062, 6063, 6064, 6065, 6066, 6067, 6068, 6069)
+            GROUP BY orderID
         )
         GROUP BY a.shopOrderID
         ORDER BY a.shopOrderID DESC
     </select>
     <select id="getOpenidListByPermission" resultType="java.lang.String">
-        SELECT DISTINCT cm.crmopenid FROM  `cm_mall_operation_user` cm
-         LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID=#{userid} AND cm.unionId= #{unionid}
+        SELECT DISTINCT cm.crmopenid
+        FROM `cm_mall_operation_user` cm
+                 LEFT JOIN `user` u ON u.userID = cm.userID
+        WHERE u.userID = #{userid}
+          AND cm.unionId = #{unionid}
     </select>
 
     <select id="getOpenidunionId" resultType="java.lang.String">
-        SELECT DISTINCT cm.unionId FROM  `cm_mall_operation_user` cm
-        LEFT JOIN `user` u ON u.userID = cm.userID
-        WHERE u.userID=#{userid}  AND cm.id=1068
+        SELECT DISTINCT cm.unionId
+        FROM `cm_mall_operation_user` cm
+                 LEFT JOIN `user` u ON u.userID = cm.userID
+        WHERE u.userID = #{userid}
+          AND cm.id = 1068
     </select>
     <select id="getProductOrder" resultType="java.lang.String">
-        SELECT productID FROM `cm_order_product` WHERE orderId=#{orderid}
+        SELECT productID
+        FROM `cm_order_product`
+        WHERE orderId = #{orderid}
+    </select>
+
+    <select id="promotionFull" resultMap="java.lang.Double">
+        SELECT promotionFullReduction
+        FROM `cm_order`
+        WHERE orderId = #{orderid}
+
     </select>
 
 </mapper>

src/main/resources/spring-mvc.xml

@@ -1,86 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:aop="http://www.springframework.org/schema/aop"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
-    
-    <description>Spring MVC Configuration</description>
-    
-    <!-- 加载配置属性文件 -->
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+		http://www.springframework.org/schema/aop
+        http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+
+
+	<description>Spring MVC Configuration</description>
+
+	<!-- 加载配置属性文件 -->
 	<context:property-placeholder ignore-unresolvable="true" location="classpath:caimei.properties" />
-	
+	<!-- 激活组件扫描功能,在包"com.caimei.modules及其子包下面自动扫描通过注解配置的组件-->
+	<context:component-scan base-package="com.caimei.modules"/>
+	<!--开启AOP切面注解: 整个项目扫描有没有@Aspect注解-->
+	<aop:aspectj-autoproxy proxy-target-class="true"/>
+
+
 	<!-- 使用Annotation自动注册Bean,只扫描@Controller -->
 	<context:component-scan base-package="com.thinkgem.jeesite,com.caimei,com.cmme" use-default-filters="false"><!-- base-package 如果多个，用“,”分隔 -->
 		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
 	</context:component-scan>
-    
+
 	<!-- 默认的注解映射的支持，org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping -->
 	<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager">
 		<mvc:message-converters register-defaults="true">
 			<!-- 将StringHttpMessageConverter的默认编码设为UTF-8 -->
 			<bean class="org.springframework.http.converter.StringHttpMessageConverter">
-		    	<constructor-arg value="UTF-8" />
+				<constructor-arg value="UTF-8" />
 			</bean>
 			<!-- 将Jackson2HttpMessageConverter的默认格式化输出为false -->
 			<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
-                <property name="supportedMediaTypes">
-                	<list><value>application/json;charset=UTF-8</value></list>
-                </property>
-                <property name="prettyPrint" value="false"/>
-                <property name="objectMapper">  
-                    <bean class="com.thinkgem.jeesite.common.mapper.JsonMapper"></bean>  
-                </property> 
-            </bean>
-            <!-- 使用XML格式输出数据 -->
-            <bean class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
-		        <constructor-arg>
-		        	<bean class="org.springframework.oxm.xstream.XStreamMarshaller">
-				        <property name="streamDriver">
-				            <bean class="com.thoughtworks.xstream.io.xml.StaxDriver"/>
-				        </property>
-				        <property name="annotatedClasses">
-				            <list>
-				                <value>com.thinkgem.jeesite.common.persistence.BaseEntity</value>
-				                <value>com.thinkgem.jeesite.common.supcan.treelist.TreeList</value>
-				                <value>com.thinkgem.jeesite.common.supcan.treelist.cols.Col</value>
-				                <value>com.thinkgem.jeesite.common.supcan.treelist.cols.Group</value>
-				            </list>
-				        </property>
-				    </bean>
-		        </constructor-arg>
-		        <property name="supportedMediaTypes" value="application/xml"></property>
+				<property name="supportedMediaTypes">
+					<list><value>application/json;charset=UTF-8</value></list>
+				</property>
+				<property name="prettyPrint" value="false"/>
+				<property name="objectMapper">
+					<bean class="com.thinkgem.jeesite.common.mapper.JsonMapper"></bean>
+				</property>
+			</bean>
+			<!-- 使用XML格式输出数据 -->
+			<bean class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
+				<constructor-arg>
+					<bean class="org.springframework.oxm.xstream.XStreamMarshaller">
+						<property name="streamDriver">
+							<bean class="com.thoughtworks.xstream.io.xml.StaxDriver"/>
+						</property>
+						<property name="annotatedClasses">
+							<list>
+								<value>com.thinkgem.jeesite.common.persistence.BaseEntity</value>
+								<value>com.thinkgem.jeesite.common.supcan.treelist.TreeList</value>
+								<value>com.thinkgem.jeesite.common.supcan.treelist.cols.Col</value>
+								<value>com.thinkgem.jeesite.common.supcan.treelist.cols.Group</value>
+							</list>
+						</property>
+					</bean>
+				</constructor-arg>
+				<property name="supportedMediaTypes" value="application/xml"></property>
 			</bean>
 		</mvc:message-converters>
 	</mvc:annotation-driven>
-	
-    <!-- REST中根据URL后缀自动判定Content-Type及相应的View -->
+
+	<!-- REST中根据URL后缀自动判定Content-Type及相应的View -->
 	<bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
-	    <property name="mediaTypes" >
-	        <map> 
-                <entry key="xml" value="application/xml"/> 
-                <entry key="json" value="application/json"/> 
-            </map>
-	    </property>
-        <property name="ignoreAcceptHeader" value="true"/>
-        <property name="favorPathExtension" value="true"/>
+		<property name="mediaTypes" >
+			<map>
+				<entry key="xml" value="application/xml"/>
+				<entry key="json" value="application/json"/>
+			</map>
+		</property>
+		<property name="ignoreAcceptHeader" value="true"/>
+		<property name="favorPathExtension" value="true"/>
 	</bean>
-	
+
 	<!-- 定义视图文件解析 -->
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="${web.view.prefix}"/>
 		<property name="suffix" value="${web.view.suffix}"/>
 	</bean>
-	
+
 	<!-- 对静态资源文件的访问， 将无法mapping到Controller的path交给default servlet handler处理 -->
 	<mvc:default-servlet-handler />
-	
+
 	<!-- 静态资源映射 -->
-    <mvc:resources mapping="/static/**" location="/static/" cache-period="31536000"/>
-	
+	<mvc:resources mapping="/static/**" location="/static/" cache-period="31536000"/>
+
 	<!-- 定义无Controller的path<->view直接映射 -->
 	<mvc:view-controller path="/" view-name="redirect:${web.view.index}"/>
-	
+
 	<!-- 拦截器配置，拦截顺序：先执行后定义的，排在第一位的最后执行。-->
 	<mvc:interceptors>
 		<mvc:interceptor>
@@ -98,25 +108,25 @@
 			<bean class="com.thinkgem.jeesite.modules.sys.interceptor.MobileInterceptor" />
 		</mvc:interceptor> -->
 	</mvc:interceptors>
-	
+
 	<!-- 支持Shiro对Controller的方法级AOP安全控制 begin-->
 	<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator" depends-on="lifecycleBeanPostProcessor">
 		<property name="proxyTargetClass" value="true" />
 	</bean>
-	
+
 	<bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
 		<property name="exceptionMappings">
 			<props>
 				<prop key="org.apache.shiro.authz.UnauthorizedException">error/403</prop>
 				<prop key="java.lang.Throwable">error/500</prop>
 			</props>
-			</property>
+		</property>
 	</bean>
 	<!-- 支持Shiro对Controller的方法级AOP安全控制 end -->
-	
-	<!-- 上传文件拦截，设置最大上传文件大小   10M=10*1024*1024(B)=10485760 bytes -->  
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">  
-		<property name="maxUploadSize" value="${web.maxUploadSize}" />  
+
+	<!-- 上传文件拦截，设置最大上传文件大小   10M=10*1024*1024(B)=10485760 bytes -->
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+		<property name="maxUploadSize" value="${web.maxUploadSize}" />
 	</bean>
-	
-</beans>
+
+</beans>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/addCommissionsForm.jsp

@@ -5,6 +5,11 @@
 	<title>订单备注</title>
 	<meta name="decorator" content="default"/>
 	<style>
+        .res{
+            color: red;
+            /*margin-right: 30px;*/
+            margin-left: 196px;
+        }
         .form-horizontal .controls {
             margin-left: 0;
         }
@@ -91,6 +96,9 @@
         #bx{
             display: none;
         }
+        .control-label{
+            margin-left: 130px;
+        }
 
     </style>
 
@@ -105,26 +113,22 @@
 <form:form id="inputForm" modelAttribute="commissions" onsubmit="return cm()" action="${ctx}/bulkpurchase/commissions/save" method="post" class="form-horizontal">
     <sys:message content="${message}"/>
 
-    <div style="height: 272px;overflow-y: auto;overflow-x: hidden;word-break:break-all">
+    <div style="height: 272px;">
+        <div style="width: 700px;margin-right: 500px">
         <tr>
             <td>
-                    <%--                        <form:radiobutton path="sales" onclick="hi()" name="sales" value="1" label="已计算提成情况"/>--%>
-                    <%--                        <br/> <br/>--%>
-                    <%--                        <form:radiobutton path="sales" onclick="hi()" name="sales" value="2" label="已退销售提成"/>--%>
-
-                <input type="radio" id="sales"  name="sales" value="已计算提成情况">已计算提成情况 &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;
-                <input type="radio" id="sales" value="已退销售提成" name="sales">已退销售提成
-                        <span id="bx">*必填</span>
-
+                <span class="res">*</span><strong>销售提成情况:</strong>
+                <input type="radio" id="sales"  name="sales" value="已计算提成情况">已计算销售提成&nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;
+                <input type="radio" style="height: 30px" id="sales" value="已退销售提成" name="sales">已退销售提成 &nbsp; <span id="bx">*必填</span>
             </td>
         </tr>
-
+    </div>
         <br/>
         <tr>
             <td>
-                <div class="control-group">
-                    <label class="control-label"><font color="red">*</font>备注内容：</label>
-                    <textarea id='script' name='script'  rows='5' placeholder="不超过200字。" cols='12' style="width: 700px" maxlength="300"></textarea>
+                <div class="control-group" style="height: 30px ">
+                    <label height="30px" class="control-label"><strong>备注内容：</strong></label>
+                    <textarea id='script' name='script'   rows='5' placeholder="不超过200字。" cols='12' style="width: 700px" maxlength="200"></textarea>
                 </div>
             </td>
         </tr>
@@ -148,7 +152,7 @@
              return true;
           }else {
               bx.style.color="red"
-             bx.style.display="block";
+             bx.style.display="inline-block";
               return false;
           }
           if(script.innerText.length>200){

src/main/webapp/WEB-INF/views/modules/bulkpurchase/cmCommissionsForm.jsp

@@ -7,7 +7,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-	<li><a href="${ctx}/order/detail?id=${orderId}">订单详细</a></li>
+	<li><a href="${ctx}/order/detail?id=${orderId}">订单详情</a></li>
 	<li class="active"><a href="${ctx}/bulkpurchase/commissions/list">销售提成记录</a></li>
 	<li><a href="${ctx}/bulkpurchase/commissions/form">添加销售提成记录</a></li>
 </ul>
@@ -15,10 +15,10 @@
 <form:form id="inputForm" modelAttribute="commissions" action="${ctx}/bulkpurchase/commissions/save" method="post" class="form-horizontal">
 	<sys:message content="${message}"/>
 
-
-	<div style="height: 272px;overflow-y: auto;overflow-x: hidden;word-break:break-all">
 	<c:forEach items="${list}" var="list" varStatus="remark">
 		<c:if test="${not empty list}">
+	<div style="overflow-y: auto;overflow-x: hidden;word-break:break-all">
+
 			<tr>
 				<td>${list.name} &nbsp; &nbsp; &nbsp; &nbsp; <span><fmt:formatDate value="${list.addTime}" type="both" pattern="yyyy-MM-dd HH:mm"/></span>
 				</td>
@@ -30,14 +30,16 @@
 				<td>备注：${list.script}</td>
 			</c:if>
 			<hr style="height:1px;border:none;border-top:1px dashed #0066CC;" />
-	</c:if>
+	</div>
+		</c:if>
 		<c:if test="${empty list.name}">
 
 			<font size="2" style="text-align: center;display: block;line-height: 60px;" color="#0066CC">暂无信息,有需要请备注！！</font>
 		</c:if>
-	</div>
+		</c:forEach>
+
+
 
-	</c:forEach>
 </form:form>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/newhome/announcementForm.jsp

@@ -156,21 +156,19 @@
     <sys:message content="${message}"/>
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
         <tr>
-            <th><span id="bx4" class="red">*</span>标题：</th>
+            <th style="margin-right: 350px" height="10px"><span style="color: red">*</span>  标题：</th>
             <td colspan="3">
-                <input name="title" id="title" maxlength="100" value="${Announcementmanagement.title}"
+                <input name="title" id="title" maxlength="30" value="${Announcementmanagement.title}"
                        onchange="checkmaxlength(this.value)"
-                       style="width: 360px;" placeholder="请输入公告标题，30字以内。" class="input-small required"/>
-                <span id="bx3" class="red">*必填</span>
-                <span id="bx1" class="red">*标题不能大于30字</span>
+                       style="width: 360px;" placeholder="请输入公告标题，30字以内。" class="short input-small required"/><span id="bx3"  class="red">*必填</span>
             </td>
 
 
         </tr>
 
         <tr>
-            <th><span id="bx2" class="red">*</span>内容： <span id="bx5" class="red">*必填</span></th>
-            <td colspan="4" style="vertical-align: top;">
+            <th style="margin-right: 250px"><span style="color: red">*</span>内容： </th>
+            <td colspan="4">
                 <div class="detailInfoEditor" style="width: 620px;">
                     <textarea name="capacity" id="capacity">${Announcementmanagement.capacity}</textarea>
                 </div>
@@ -212,23 +210,22 @@
 
 //判断非空
     function um(){
-        var capacity=document.getElementById("capacity").value.length;
+        // debugger
+        var capacity=document.getElementById("capacity").value;
         var title=document.getElementById("title").value.length;
-        var bx1=document.getElementById("bx1");
-        var bx2=document.getElementById("bx2");
         var bx3=document.getElementById("bx3");
-        var bx4=document.getElementById("bx4");
         var bx5=document.getElementById("bx5");
-
-        if(title==0 && capacity==0){
-            bx2.style.display="block";
-            bx3.style.display="block";
-            bx4.style.display="block";
-            bx5.style.display="block";
+        console.log('2222222222222',title);
+        if(title==0){
+            console.log('111111111',title);
+            bx3.style.display="inline-block";
+            bx5.style.display="inline";
         return false;
        }
-        if(title>30){
-            bx1.style.display="block";
+
+    if(capacity.equals("")){
+            bx3.style.display="inline-block";
+            bx5.style.display="inline-block";
             return false;
         }
     }

src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -116,7 +116,7 @@
 								${cs}<br/>
 							</c:forEach>
 						</td>
-						<td>${s.income-s.discountTotalFee-s.couponAmount}</td>
+						<td>${s.income-s.discountTotalFee-s.couponAmount-s.promotionFullReduction}</td>
 						<td>
 							<label class="clubFreight"  style="display: none">
 								<c:choose>
@@ -206,8 +206,8 @@
 					<tr>
 						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
 						<td colspan="3">${s.shopName}</td>
-						<td colspan="3" class="payCm-t">子订单佣金</td>
-						<td colspan="3" class="product-fee">${s.shopProductAmount-s.discountTotalFee-s.couponAmount}</td>
+						<td colspan="3" class="payCm-t">${s.income-s.shopPostFee-s.discountTotalFee-s.couponAmount-s.promotionFullReduction}</td>
+						<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
 
 						<td class="taxes">
 							<fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -413,6 +413,7 @@
         </div>
         <div class="payment-form-content">
             <c:forEach items="${cmPayShop.shopOrders}" var="s">
+               <input type="hidden" value="${promotionFull}" class="promotionFullReduction" ><%-- //满减优惠--%>
                 <table class="table table-striped table-bordered table-condensed pay-table">
                     <tr>
                         <th>订单编号(ID)</th>
@@ -425,7 +426,7 @@
                         <th>收款状态</th>
                         <th colspan="3">收款金额</th>
                         <th>经理折扣</th>
-                        <th>优惠券</th>
+                       <th>优惠券</th>
                     <tr/>
                     <tr>
                         <td> ${s.orderNo}(${s.orderID})</td>
@@ -510,7 +511,7 @@
                             </c:if>
                             <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
                         </td>
-                        <td>${s.couponAmount} </td>
+                        <td class="couponAmount">${s.couponAmount} </td>
                     <tr/>
                     <tr>
                         <th>子订单编号(ID)</th>
@@ -527,7 +528,7 @@
                     <tr>
                         <td>${s.shopOrderNo}(${s.shopOrderID})</td>
                         <td colspan="3">${s.shopName}</td>
-                        <td colspan="3" class="payCm-t">子订单佣金</td>
+                        <td colspan="3" class="payCm-t"></td> <%-- 子订单佣金=总金额-付第三方-供应商运费-分摊优惠--%>
                         <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
 
                         <td class="taxes">
@@ -938,17 +939,19 @@
             var thisEle = $(this),
                 totalComissionVal = 0,
                 resVal = '';
-            totalComissionEle = thisEle.find('.payCm'),
-                comissionEle = thisEle.find('.payCm-t'),
-                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
-                freightVal = thisEle.find('.freight').text().replace(',', ''),
-                clubFreight = Number(thisEle.find('.clubFreight').text().replace(',', '')),
-                discountFee = Number(thisEle.find('.discountFee').text().replace(',', ''));
+            totalComissionEle = thisEle.find('.payCm'),//总价
+                comissionEle = thisEle.find('.payCm-t'),//子订单佣金
+                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),//付第三方
+                freightVal = thisEle.find('.freight').text().replace(',', ''),//供应商运费
+                couponAmount = Number(thisEle.find('.couponAmount').text().replace(',', '')),//优惠卷
+                discountFee = Number(thisEle.find('.discountFee').text().replace(',', ''));//经理折扣
+            promotionFullReduction=Number(thisEle.find('.promotionFullReduction').text().replace(',', ''));//满减优惠
             totalComissionEle.each(function () {
                 totalComissionVal += Number($(this).text().replace(',', ''));
             })
-            resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
-            comissionEle.text(resVal);
+            alert(promotionFullReduction.toFixed(2));
+            resVal = (totalComissionVal - discountFee - thirdPartyVal - freightVal-couponAmount-promotionFullReduction).toFixed(2);
+            comissionEle.text(promotionFullReduction.toFixed(2)+""+couponAmount.toFixed(2));
         })
 
         $('.apply-btn').on('click', function () {

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -713,7 +713,9 @@
                     <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>
                     <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
-                    <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>                    <%--包含订单充值商品就不显示--%>
+                    <c:if test="${order.orderSubmitType != 0 && order.orderType !=0 }">
+                    <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
+                    </c:if>                  <%--包含订单充值商品就不显示--%>
                     <c:if test="${empty order.rechargeGoods}">
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -372,7 +372,7 @@
         <tr>
             <th><span class="red">*</span>商品类型：</th>
             <td colspan="3">
-                <form:select path="productType" class="input-small required" onclick="changeMachine(this)">
+                <form:select path="productType" id="productType" onchange="js()" class="input-small required" onclick="changeMachine(this)">
                     <form:option value="" label="请选择"/>
                     <form:option value="1" label="妆字号"/>
                     <form:option value="2" label="械字号"/>
@@ -690,6 +690,37 @@
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript" src="${ctxStatic}/ckeditor5-new/ckeditor.js"></script>
 <script type="text/javascript">
+
+    $(function (){
+        var productType= $("#productType").val();
+        if (productType=="2"){
+            $("#priceFlag").val(3);
+            $("#visibility").val(4);
+            $("#visibility").prev().find(".select2-chosen").text("仅对医美机构开放");
+            $("#priceFlag").prev().find(".select2-chosen").text("仅对医美机构开放");
+            $("#priceFlag").prop("disabled",true);
+            $("#visibility").prop("disabled",true);
+        }
+    })
+
+    function js(){
+            var val = $("#productType").val();
+            if(val == '2'){
+                $("#priceFlag").val(3);
+                $("#visibility").val(4);
+                $("#visibility").prev().find(".select2-chosen").text("仅对医美机构开放");
+                $("#priceFlag").prev().find(".select2-chosen").text("仅对医美机构开放");
+                $("#priceFlag").prop("disabled",true);
+                $("#visibility").prop("disabled",true);
+            } else {
+            $("#priceFlag").prop("disabled",false);
+            $("#visibility").prop("disabled",false);
+
+             }
+        }
+
+
+
     $(document).ready(function () {
 
         $('body').on('keyup', '#wipeRemarks', function () {

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

@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
 	<title>未确认机构管理</title>

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

@@ -10,99 +10,99 @@
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			
+
 		});
 		function page(n,s){
 			$("#pageNo").val(n);
 			$("#pageSize").val(s);
 			$("#searchForm").submit();
-        	return false;
-        }
+			return false;
+		}
 	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/new/user/agency/">机构列表</a></li>
-		<li class="active"><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
-		<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="clubTemporary" action="${ctx}/user/clubTemporary/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<div class="ul-form">
-			 <label>机构名称：</label>
-				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-			 <label>联系人：</label>
-				<form:input path="linkMan" htmlEscape="false" maxlength="50" class="input-medium"/>
-			 <label>手机号：</label>
-				<form:input path="bindMobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-			 <label>邮箱：</label>
-				<form:input path="contractEmail" htmlEscape="false" maxlength="50" class="input-medium"/>
-			<br><br>
-			 <label>添加时间：</label>
-				<input name="startTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
-					   value="${clubTemporary.startTime}"
-					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> -
-				<input name="endTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
-					   value="${clubTemporary.endTime}"
-					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<font color="red">未确认机构是指协销拉机构上线后，暂未通过协销分享的链接确认注册的机构。客服可在本页面暂时为机构确认注册，确认后<br>
-		协销可以帮机构下一个订单。在机构没有自己确认之前，每次协销为机构下单前都需要客服确认一次</font>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>机构名称</th>
-				<th>机构简称</th>
-				<th>联系人</th>
-				<th>手机号</th>
-				<th>邮箱</th>
-				<th>协销人员</th>
-				<th>机构类别</th>
-				<th>添加时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="club">
-			<tr>
-				<td>
+<ul class="nav nav-tabs">
+	<li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+	<li class="active"><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="clubTemporary" action="${ctx}/user/clubTemporary/" method="post" class="breadcrumb form-search">
+	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+	<div class="ul-form">
+		<label>机构名称：</label>
+		<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+		<label>联系人：</label>
+		<form:input path="linkMan" htmlEscape="false" maxlength="50" class="input-medium"/>
+		<label>手机号：</label>
+		<form:input path="bindMobile" htmlEscape="false" maxlength="20" class="input-medium"/>
+		<label>邮箱：</label>
+		<form:input path="contractEmail" htmlEscape="false" maxlength="50" class="input-medium"/>
+		<br><br>
+		<label>添加时间：</label>
+		<input name="startTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+			   value="${clubTemporary.startTime}"
+			   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> -
+		<input name="endTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+			   value="${clubTemporary.endTime}"
+			   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+		&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+		<div class="clearfix"></div>
+	</div>
+</form:form>
+<sys:message content="${message}"/>
+<font color="red">未确认机构是指协销拉机构上线后，暂未通过协销分享的链接确认注册的机构。客服可在本页面暂时为机构确认注册，确认后<br>
+	协销可以帮机构下一个订单。在机构没有自己确认之前，每次协销为机构下单前都需要客服确认一次</font>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+	<thead>
+	<tr>
+		<th>机构名称</th>
+		<th>机构简称</th>
+		<th>联系人</th>
+		<th>手机号</th>
+		<th>邮箱</th>
+		<th>协销人员</th>
+		<th>机构类别</th>
+		<th>添加时间</th>
+		<th>操作</th>
+	</tr>
+	</thead>
+	<tbody>
+	<c:forEach items="${page.list}" var="club">
+		<tr>
+			<td>
 					${empty club.name ? "------" : club.name}
-				</td>
-				<td>
+			</td>
+			<td>
 					${empty club.shortName ? "------" : club.shortName}
-				</td>
-				<td>
-						${club.linkMan}
-				</td>
-				<td>
+			</td>
+			<td>
+					${club.linkMan}
+			</td>
+			<td>
 					${club.bindMobile}
-				</td>
-				<td>
+			</td>
+			<td>
 					${empty club.contractEmail ? "------" : club.contractEmail}
-				</td>
-				<td>${club.spName}</td>
-				<td>
-						${empty club.businessLicense ? "个人机构" : "资质机构"}
-					<font color="red">(普通会员)</font>
-				</td>
-				<td>
-					<fmt:formatDate value="${club.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
-				</td>
-				<td>
-    				<a href="${ctx}/user/clubTemporary/form?id=${club.id}">编辑</a>
-					<a href="${ctx}/user/clubTemporary/registerPage?id=${club.id}">确认注册</a>
-					<a href="${ctx}/user/clubTemporary/confirmRecord?id=${club.id}">确认记录</a>
+			</td>
+			<td>${club.spName}</td>
+			<td>
+					${empty club.businessLicense ? "个人机构" : "资质机构"}
+				<font color="red">(普通会员)</font>
+			</td>
+			<td>
+				<fmt:formatDate value="${club.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+			</td>
+			<td>
+				<a href="${ctx}/user/clubTemporary/form?id=${club.id}">编辑</a>
+				<a href="${ctx}/user/clubTemporary/registerPage?id=${club.id}">确认注册</a>
+				<a href="${ctx}/user/clubTemporary/confirmRecord?id=${club.id}">确认记录</a>
 					<%--<a href="${ctx}/user/clubTemporary/delete?id=${club.id}" onclick="return confirmx('确认要删除该未确认机构吗？', this.href)">删除</a>--%>
-				</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>
+			</td>
+		</tr>
+	</c:forEach>
+	</tbody>
+</table>
+<div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -38,9 +38,9 @@
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
         <label>机构名称：</label>
-        <input name="institutionName" maxlength="50" class="input-medium"/>
+        <form:input path="institutionName" name="institutionName" htmlEscape="false" maxlength="50" class="input-medium"/>
         <label>联系人：</label>
-        <input name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
+        <form:input path="Contact" name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
             <label>机构类别：</label>
             <select name="operationtype" class="input-medium">
                 <option selected value="">全部</option>
@@ -53,12 +53,14 @@
                 <option value="更改状态">更改状态</option>
             </select>
 
-        <label>操作时间：</label>
-        <input name="Operationtime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
-               value="${clubTemporary.startTime}"
-               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-        <div class="clearfix"></div>
+    <label>操作时间：</label>
+    <form:input path="startTime" type="text" maxlength="20" class="input-mini Wdate" value="${clubTemporary.startTime}"
+                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+    -
+    <form:input path="endTime" type="text" maxlength="20" class="input-mini Wdate" value="${clubTemporary.startTime}"
+                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+   <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+    <div class="clearfix"></div>
     </div>
 </form:form>
 <sys:message content="${message}"/>
@@ -68,7 +70,7 @@
         <th>机构名称</th>
         <th>联系人</th>
         <th>操作类型</th>
-        <th>操作类容</th>
+        <th>操作内容</th>
         <th>操作人</th>
         <th>操作时间</th>
     </tr>
@@ -80,7 +82,7 @@
                     ${empty cmop.institutionName ? "------" : cmop.institutionName}
             </td>
             <td>
-                    ${empty cmop.contact ? "________" : cmop.contact}
+                    ${empty cmop.contact ? "-------" : cmop.contact}
             </td>
             <td>
                     ${empty cmop.operationtype ? "_______" : cmop.operationtype}
@@ -98,4 +100,4 @@
 </table>
 <div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -29,8 +29,8 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
-    <li class="active"><a href="${ctx}/user/cmOperationalShop/">操作日志</a></li>
+    <li class=""><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
+    <li class="active"><a href="${ctx}/user/cmOperationalLogsShop/">操作日志</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="cmoperationalLogs" action="${ctx}/user/cmOperationalLogsShop/" method="post"
            class="breadcrumb form-search">
@@ -38,9 +38,9 @@
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
         <label>机构名称：</label>
-        <input name="institutionName" maxlength="50" class="input-medium"/>
+        <form:input path="institutionName" name="institutionName" htmlEscape="false" maxlength="50" class="input-medium"/>
         <label>联系人：</label>
-        <input name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
+        <form:input path="Contact" name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
             <label>机构类别：</label>
             <select name="operationtype" class="input-medium">
                 <option selected value="">全部</option>
@@ -49,9 +49,11 @@
                 <option value="审核">审核</option>
                 <option value="更改状态">更改状态</option>
             </select>
-
-        <label>操作时间：</label>
-        <input name="Operationtime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+        <label>添加时间：</label>
+        <input name="startTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+               value="${clubTemporary.startTime}"
+               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> -
+        <input name="endTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
                value="${clubTemporary.startTime}"
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
@@ -65,7 +67,7 @@
         <th>机构名称</th>
         <th>联系人</th>
         <th>操作类型</th>
-        <th>操作类容</th>
+        <th>操作内容</th>
         <th>操作人</th>
         <th>操作时间</th>
     </tr>
@@ -95,4 +97,4 @@
 </table>
 <div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -476,6 +476,7 @@ function loadTown(curTown) {
 	var val = $("#maintenanceFee").val();
         // 1已缴纳，0未缴纳
         if(val == '1'){
+			val="0";
             $(".maintenanceDate1").show();
         }else if(val == '0'){
             $(".maintenanceDate1").hide();

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

@@ -170,7 +170,7 @@
 <body>
 <ul class="nav nav-tabs">
 	<li class="active"><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
-	<li class="active"><a href="${ctx}/user/cmOperationalLogsShop/">操作日志</a></li>
+	<li class=""><a href="${ctx}/user/cmOperationalLogsShop/">操作日志</a></li>
 	<%--		<shiro:hasPermission name="user:newCmShop:edit"><li><a href="${ctx}/user/newCmShop/form">供应商信息添加</a></li></shiro:hasPermission>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/" method="post" class="breadcrumb form-search">

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyForm.jsp

@@ -509,29 +509,29 @@
         </tr>
         <tr height="28">
             <th width="12%">机构名称：</th>
-            <td width="13%"><form:input path="name" htmlEscape="false" maxlength="20"
-                                        class="input-medium" value="${newCmClub.userIdentity eq 4 && newCmClub.status eq 90?'':newCmClub.name}"/></td>
+            <td width="13%"><form:input path="name" name="name" htmlEscape="false" maxlength="20"
+                                        class="input-medium" value="${newCmClub.name}"/></td>
             <th width="12%">机构简称：</th>
-            <td width="13%"><form:input path="sname" htmlEscape="false" maxlength="20"
-                                        class="input-medium"  value="${newCmClub.userIdentity eq 4 && newCmClub.status eq 90?'':newCmClub.sname}"/></td>
+            <td width="13%"><form:input path="sname" name="sname" htmlEscape="false" maxlength="20"
+                                        class="input-medium"  value="${newCmClub.sname}"/></td>
             <th width="12%">注册邮箱：</th>
-            <td width="13%"><form:input path="contractEmail" htmlEscape="false" maxlength="20"
+            <td width="13%"><form:input path="contractEmail" name="contractEmail" htmlEscape="false" maxlength="20"
                                         class="input-medium"/></td>
         </tr>
         <tr height="28">
             <th width="12%"><font color="red">*</font>联系人：</th>
             <td width="13%">
-                <form:input path="userName" htmlEscape="false" maxlength="20"
+                <form:input path="userName" name="userName" htmlEscape="false" maxlength="20"
                                         class="input-medium required"  value="${newCmClub.userName}"/>
             </td>
             <th width="12%"><font color="red">*</font> 手机号：</th>
-            <td width="13%"><form:input path="bindMobile" htmlEscape="false" maxlength="20"
+            <td width="13%"><form:input path="bindMobile" name="bindMobile" htmlEscape="false" maxlength="20"
                                         class="input-medium required"  value="${newCmClub.bindMobile}" onchange="checkMobile()"/></td>
             <th width="12%"><font color="red">*</font> 联系人身份：</th>
             <td width="13%">
-                <form:radiobutton path="linkManIdentity" class="required" value="1" label="老板"/>
-                <form:radiobutton path="linkManIdentity" class="required" value="2" label="采购"/>
-                <form:radiobutton path="linkManIdentity" class="required" value="3" label="运营"/>
+                <form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="1" label="老板"/>
+                <form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="2" label="采购"/>
+                <form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="3" label="运营"/>
             </td>
         </tr>
     </table>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -60,7 +60,7 @@
     <div class="flex-wrap">
         <div class="item">
             <label>机构名称：</label>
-            <form:input path="searchName" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <form:input path="searchName"  htmlEscape="false" maxlength="50" class="input-medium"/>
         </div>
         <div class="item">
             <label>联系人：</label>
@@ -129,17 +129,17 @@
     <c:forEach items="${page.list}" var="newCmClubList">
         <tr>
             <td>
-                <c:if test="${newCmClubList.userIdentity eq 2}">
+<%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
                     ${newCmClubList.name}
-                </c:if>
-                <c:if test="${newCmClubList.userIdentity eq 4}">
-                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">
-                        ${newCmClubList.name}
-                    </c:if>
-                    <c:if test="${newCmClubList.name eq newCmClubList.userName}">
-                        --
-                    </c:if>
-                </c:if>
+<%--                </c:if>--%>
+<%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
+<%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>
+<%--                        ${newCmClubList.name}--%>
+<%--                    </c:if>--%>
+<%--                    <c:if test="${newCmClubList.name eq newCmClubList.userName}">--%>
+<%--                        ----%>
+<%--                    </c:if>--%>
+<%--                </c:if>--%>
             </td>
             <td>
                 <c:if test="${newCmClubList.userIdentity eq 2}">