Merge remote-tracking branch 'origin/developerF' into developerF

# Conflicts:
#	src/main/java/com/caimei/modules/order/service/SplitAccountService.java

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -273,7 +273,7 @@ public class CmRefundsProductController extends BaseController {
             //是否可以线上退回
             boolean returnOnline = false;
             if (cmDiscernReceipt != null && "1".equals(cmDiscernReceipt.getPayWay())) {
-                Date splitTime = cmDiscernReceiptDao.findSplitTime(newOrder.getOrderID());
+                /*Date splitTime = cmDiscernReceiptDao.findSplitTime(newOrder.getOrderID());
                 if (splitTime != null) {
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(splitTime);
@@ -284,7 +284,8 @@ public class CmRefundsProductController extends BaseController {
                     }
                 } else {
                     returnOnline = true;
-                }
+                }*/
+                returnOnline = true;
             }
             Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(newOrder.getOrderID().toString());
             model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);

src/main/java/com/caimei/modules/bulkpurchase/web/CommissionsController.java

@@ -31,28 +31,20 @@ public class CommissionsController extends BaseController {
     @Autowired
     CommissionsService commissionsService;
 
-    public static String orderId;
+
 
     @RequestMapping(value = {""})
     public String list(Commissions commissions, HttpServletRequest request, HttpServletResponse response, Model model) {
         List<Commissions> list=commissionsService.findList(commissions);
-        orderId=commissions.getOrderId();
         model.addAttribute("list",list);
         model.addAttribute("orderId",commissions.getOrderId());
         return "/modules/bulkpurchase/cmCommissionsForm";
     }
 
-
-    @RequestMapping(value = {"list"})
-    public String lists(Commissions commissions, HttpServletRequest request, HttpServletResponse response, Model model) {
-
-        return "redirect:" + Global.getAdminPath() + "/bulkpurchase/commissions?orderId="+orderId;
-    }
-
-
     @RequestMapping(value = "form")
-    public String form(Commissions commissions, Model model) {
-
+    public String form(Commissions commissions, Model model,HttpServletRequest request, HttpServletResponse response) {
+        String orderId=request.getParameter("orderId");
+        model.addAttribute("OrderId",orderId);
 
         return "modules/bulkpurchase/addCommissionsForm";
     }
@@ -60,12 +52,13 @@ public class CommissionsController extends BaseController {
 
 
     @RequestMapping(value = "save")
-    public String save(Commissions commissions, Model model) {
+    public String save(Commissions commissions, Model model,HttpServletRequest request) {
 
         Date date = new Date();
         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
         commissions.setAddTime(date);
         commissions.setName( principal.getName());
+        String orderId=request.getParameter("orderId");
         commissions.setOrderId(orderId);
             int i = commissionsService.insert(commissions);
 

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

@@ -28,8 +28,6 @@ public class AnnouncementController extends BaseController {
     @Autowired
     AnnouncementService announcementService;
 
-    public static String id;
-
     @RequiresPermissions("newhome:announcementList:view")
     @RequestMapping(value = {""})
     public String list(Announcementmanagement announcementmanagement, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -43,7 +41,7 @@ public class AnnouncementController extends BaseController {
     public String form(Announcementmanagement announcementmanagement, Model model) {
         if (!announcementmanagement.getId().equals(null) || !announcementmanagement.getId().equals("")) {
             announcementmanagement = announcementService.announlist(announcementmanagement);
-            id = announcementmanagement.getId();
+            announcementmanagement.getId();
             model.addAttribute("Announcementmanagement", announcementmanagement);
         }
         return "modules/newhome/announcementForm";
@@ -60,9 +58,8 @@ public class AnnouncementController extends BaseController {
     @RequiresPermissions("newhome:announcementForm:view")
     @RequestMapping(value = "save")
     public String save(Announcementmanagement announcementmanagement, Model model) {
-        logger.info("*************用户id"+id);
-        if (id != null) {
-            announcementmanagement.setId(id);
+        System.out.println("*************用户id"+announcementmanagement.getId());
+        if (!"".equals(announcementmanagement.getId()) ) {
             announcementService.update(announcementmanagement);
         } else {
             Date date = new Date();

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

@@ -97,4 +97,6 @@ public interface CmDiscernReceiptDao extends CrudDao<CmDiscernReceipt> {
     List<CmMainReceiptExport> secondReceipt(CmDiscernReceipt cmDiscernReceipt);
 
     ReceipCouponInfoVo getCouponInfo(String receiptID);
+
+    List<NewShopOrder> getShopOrderInfos(@Param("shopOrderId") String shopOrderId,@Param("orderId") String orderId);
 }

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

@@ -17,8 +17,6 @@ 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/entity/NewOrder.java

@@ -54,7 +54,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String clauseName;          // varchar(50) comment '条款名称',
     private String freePostFlag;        // char(1) comment 免邮标志 运费：-1到付，0包邮，1需要运费
     private Double freight;             // decimal(20,0) comment '运费' v5.0版本已废弃,运费已使用商品形式存储,
-    //    private Integer freePostageTicketID; // bigint(11) comment '包邮券ID',
+    //    private Integer freePostageTicketID; // bigint(11) comment '包邮券ID',newShopOrders
     private Integer buyUserID;//            下单人
     private String orderType;//    订单类型 0协销订单、 1普通订单、 2呵呵订单
     private List<NewShopOrder> newShopOrders;
@@ -70,6 +70,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String splitFlag; // 订单能否拆分 1 为可拆分, 0为不可拆分
     private String closeReason; //订单取消原因
     private String invoiceFlag;      //是否开发票 0 不开 1 开发票
+    private Double discountAmount;  // 优惠金额：经理折扣+促销优惠+优惠券抵扣金额
     // ---------------- v5.0.0 新加
     private String receiptStatus; //（收款买家）收款状态：1待收款、2部分收款、3已收款
     private String payStatus; //(付款供应商)付款状态：1待付款、2部分付款、3已付款
@@ -1129,5 +1130,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setReductionTouchPrice(Double reductionTouchPrice) {
         this.reductionTouchPrice = reductionTouchPrice;
     }
+
+    public Double getDiscountAmount() {
+        return discountAmount;
+    }
+
+    public void setDiscountAmount(Double discountAmount) {
+        this.discountAmount = discountAmount;
+    }
 }
 

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -44,7 +44,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Integer status;//     int(11) comment '订单状态：见表c_orderstatus或枚举OrderStatus'   v5.0版本已废弃只有主订单状态,
     private Integer refundStatus;//    int(11),
     private BigInteger deliveryTimeMills;//   bigint(20) comment '发货时间（时间戳）',
-    private Double needPayAmount;//   decimal(20,2) comment '实付金额',
+    private Double needPayAmount;//   decimal(20,2) comment '实付金额(未减去优惠金额)',
     private Double realPay;     // 实际支付金额
     private Double eachDiscount;        // 分摊优惠金额
     private Double receiptAmount;       // 已付金额

src/main/java/com/caimei/modules/order/entity/ReceiptOrderInfoVo.java

@@ -18,6 +18,8 @@ public class ReceiptOrderInfoVo {
     private String orderTime;//下单时间
     private String relationType;        // 关系类型：1返佣订单（返佣款或供应商退款）、2非返佣订单（订单款或者非订单款）、3超级会员款
     private Integer userID;     //订单用户id
+    private Integer onlinePayFlag;      // 是否能走线上支付：0可以，1不可以
+    private List<NewShopOrder> shopOrderInfos;  // 子订单信息
 
     //----------------返佣款项   是根据子订单再去关联的主订单
     private String shopOrderNo;
@@ -199,4 +201,20 @@ public class ReceiptOrderInfoVo {
     public void setRefundsAmount(Double refundsAmount) {
         this.refundsAmount = refundsAmount;
     }
+
+    public Integer getOnlinePayFlag() {
+        return onlinePayFlag;
+    }
+
+    public void setOnlinePayFlag(Integer onlinePayFlag) {
+        this.onlinePayFlag = onlinePayFlag;
+    }
+
+    public List<NewShopOrder> getShopOrderInfos() {
+        return shopOrderInfos;
+    }
+
+    public void setShopOrderInfos(List<NewShopOrder> shopOrderInfos) {
+        this.shopOrderInfos = shopOrderInfos;
+    }
 }

src/main/java/com/caimei/modules/order/entity/ShopOrderReturned.java

@@ -15,6 +15,11 @@ public class ShopOrderReturned {
     private Double productAmount;//总金额 = 订单商品totalAmount
     private String commercialCode;      //分账方,子商户商编
     private List<CmReturnedPurchaseProduct> cmReturnedPurchaseProductList;
+    private Integer shopReceiptStatus;      // 子订单收款状态:1待收款，2部分收款，3已收款
+    private Double eachDiscount;        // 分摊优惠金额
+    private Double receiptAmount;       // 已付金额
+    private Double restAmount;      // 待付金额
+    private Double realPay;     // 实际支付金额
 
     public String getShopName() {
         return shopName;
@@ -111,4 +116,44 @@ public class ShopOrderReturned {
     public void setCommercialCode(String commercialCode) {
         this.commercialCode = commercialCode;
     }
+
+    public Integer getShopReceiptStatus() {
+        return shopReceiptStatus;
+    }
+
+    public void setShopReceiptStatus(Integer shopReceiptStatus) {
+        this.shopReceiptStatus = shopReceiptStatus;
+    }
+
+    public Double getEachDiscount() {
+        return eachDiscount;
+    }
+
+    public void setEachDiscount(Double eachDiscount) {
+        this.eachDiscount = eachDiscount;
+    }
+
+    public Double getReceiptAmount() {
+        return receiptAmount;
+    }
+
+    public void setReceiptAmount(Double receiptAmount) {
+        this.receiptAmount = receiptAmount;
+    }
+
+    public Double getRestAmount() {
+        return restAmount;
+    }
+
+    public void setRestAmount(Double restAmount) {
+        this.restAmount = restAmount;
+    }
+
+    public Double getRealPay() {
+        return realPay;
+    }
+
+    public void setRealPay(Double realPay) {
+        this.realPay = realPay;
+    }
 }

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

@@ -156,12 +156,22 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                         BigDecimal refundsAmount = MathUtil.add(roi.getRefundsAmount(), shopRefundAmount);
                         roi.setRefundsAmount(refundsAmount.doubleValue());*/
                     }
+                    if (0 == roi.getOnlinePayFlag()) {
+                        // 可以线上支付，查询子订单信息
+                        List<NewShopOrder> shopOrderInfos = cmDiscernReceiptDao.getShopOrderInfos(relation.getOrderID(), null);
+                        roi.setShopOrderInfos(shopOrderInfos);
+                    }
                 }
             }
             if ("2".equals(relation.getRelationType())) { // relation.orderID 指的是主订单id
                 roi = cmDiscernReceiptDao.getOrderInfoByOrderID(relation.getOrderID());
                 if (null != roi) {
                     roi.setRelationType("2");
+                    if (0 == roi.getOnlinePayFlag()) {
+                        // 可以线上支付，查询子订单信息
+                        List<NewShopOrder> shopOrderInfos = cmDiscernReceiptDao.getShopOrderInfos(null, relation.getOrderID());
+                        roi.setShopOrderInfos(shopOrderInfos);
+                    }
                 }
             }
             if (null != roi) {

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

@@ -65,12 +65,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
     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();
@@ -271,8 +265,6 @@ 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);
@@ -359,8 +351,6 @@ 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/service/CmReturnedPurchaseService.java

@@ -389,6 +389,12 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                             shopOrderReturned.setPayStatus(shopOrder.getPayStatus());
                             shopOrderReturned.setSendOutStatus(shopOrder.getSendOutStatus());
                             shopOrderReturned.setShopOrderNo(shopOrder.getShopOrderNo());
+                            shopOrderReturned.setShopReceiptStatus(shopOrder.getShopReceiptStatus());
+                            shopOrderReturned.setNeedPayAmount(shopOrder.getNeedPayAmount());
+                            shopOrderReturned.setEachDiscount(shopOrder.getEachDiscount());
+                            shopOrderReturned.setRealPay(shopOrder.getRealPay());
+                            shopOrderReturned.setReceiptAmount(shopOrder.getReceiptAmount());
+                            shopOrderReturned.setRestAmount(shopOrder.getRestAmount());
                         }
                     }
                     shopOrderReturnedList.add(shopOrderReturned);

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

@@ -586,12 +586,8 @@ 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/order/web/SplitAccountController.java

@@ -1,70 +1,70 @@
-package com.caimei.modules.order.web;
-
-import com.caimei.modules.order.dao.NewOrderDao;
-import com.caimei.modules.order.dao.NewShopOrderDao;
-import com.caimei.modules.order.entity.NewShopOrder;
-import com.caimei.modules.order.entity.OrderReceiptRelationPo;
-import com.caimei.modules.order.service.SplitAccountService;
-import com.caimei.redis.RedisService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-@Controller
-@RequestMapping(value = "${adminPath}/splitAccount/")
-public class SplitAccountController extends BaseController {
-
-    @Resource
-    private SplitAccountService splitAccountService;
-
-    @Resource
-    private NewOrderDao newOrderDao;
-
-    @Resource
-    private RedisService redisService;
-
-    @RequestMapping("split")
-    public String SplitAccount(RedirectAttributes redirectAttributes) {
-        Integer xsfzmds = (Integer) redisService.get("XSFZMDS");
-        //验锁
-        if (null != xsfzmds && xsfzmds > 0) {
-            addMessage(redirectAttributes, "请勿短时间内重复分账，等待支付公司返回分账结果！");
-            return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
-        }
-        //设置分账间隔，2-3分钟，禁止重复分账
-        Date splitTime = newOrderDao.findSplitTime();
-        if (null != splitTime) {
-            addMessage(redirectAttributes, "请勿短时间内重复分账，等待支付公司返回分账结果！");
-            return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
-        }
-        //查询是否有账单可分账,没有return
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String currentTime = format.format(calendar.getTime());
-        // 查询未分账已支付收款
-        List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime);
-        if (null != orderRelations && orderRelations.size() > 0) {
-            //设锁
-            redisService.set("XSFZMDS", 1, 120L);
-            splitAccountService.SplitAccount();
-            addMessage(redirectAttributes, "分账成功！");
-        } else {
-            addMessage(redirectAttributes, "暂无收款金额可进行分账！");
-        }
-        return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
-    }
-}
+//package com.caimei.modules.order.web;
+//
+//import com.caimei.modules.order.dao.NewOrderDao;
+//import com.caimei.modules.order.dao.NewShopOrderDao;
+//import com.caimei.modules.order.entity.NewShopOrder;
+//import com.caimei.modules.order.entity.OrderReceiptRelationPo;
+//import com.caimei.modules.order.service.SplitAccountService;
+//import com.caimei.redis.RedisService;
+//import com.thinkgem.jeesite.common.config.Global;
+//import com.thinkgem.jeesite.common.persistence.Page;
+//import com.thinkgem.jeesite.common.web.BaseController;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+//
+//import javax.annotation.Resource;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.text.SimpleDateFormat;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.List;
+//
+//@Controller
+//@RequestMapping(value = "${adminPath}/splitAccount/")
+//public class SplitAccountController extends BaseController {
+//
+//    @Resource
+//    private SplitAccountService splitAccountService;
+//
+//    @Resource
+//    private NewOrderDao newOrderDao;
+//
+//    @Resource
+//    private RedisService redisService;
+//
+//    @RequestMapping("split")
+//    public String SplitAccount(RedirectAttributes redirectAttributes) {
+//        Integer xsfzmds = (Integer) redisService.get("XSFZMDS");
+//        //验锁
+//        if (null != xsfzmds && xsfzmds > 0) {
+//            addMessage(redirectAttributes, "请勿短时间内重复分账，等待支付公司返回分账结果！");
+//            return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
+//        }
+//        //设置分账间隔，2-3分钟，禁止重复分账
+//        Date splitTime = newOrderDao.findSplitTime();
+//        if (null != splitTime) {
+//            addMessage(redirectAttributes, "请勿短时间内重复分账，等待支付公司返回分账结果！");
+//            return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
+//        }
+//        //查询是否有账单可分账,没有return
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTime(new Date());
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String currentTime = format.format(calendar.getTime());
+//        // 查询未分账已支付收款
+//        List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime);
+//        if (null != orderRelations && orderRelations.size() > 0) {
+//            //设锁
+//            redisService.set("XSFZMDS", 1, 120L);
+//            splitAccountService.SplitAccount();
+//            addMessage(redirectAttributes, "分账成功！");
+//        } else {
+//            addMessage(redirectAttributes, "暂无收款金额可进行分账！");
+//        }
+//        return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList/?repage";
+//    }
+//}

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

@@ -1,5 +1,8 @@
 package com.caimei.modules.user.aop;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
 import com.caimei.modules.user.utils.HttpContextUtils;
@@ -8,23 +11,32 @@ import com.caimei.modules.user.web.newUser.AgencyController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import com.yeepay.g3.sdk.yop.utils.JsonUtils;
+import net.sf.json.util.JSONUtils;
+import net.sf.jsqlparser.statement.select.Join;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
 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.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ui.Model;
+
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Aspect
 @Component
@@ -43,7 +55,27 @@ public class OperationLogAspect {
 
     }
 
+    private HashMap paramToMap(JoinPoint joinPoint) {
+
+        HashMap map = new HashMap<>();
+
+        //获取参数对象
+        Object[] args = joinPoint.getArgs();
+
+        //参数列表
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        String[] parameterNames = methodSignature.getParameterNames();
+        int index = 0;
+        for(String str : parameterNames) {
+            map.put(str,args[index++]);
+        }
+        return map;
+    }
+
+
     @AfterReturning("logPointCut()")
+    @JsonIgnore
     public void saveSysLog(JoinPoint joinPoint) throws IOException {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         //保存日志
@@ -54,14 +86,25 @@ public class OperationLogAspect {
         //获取切入点所在的方法
         Method method = signature.getMethod();
         sysLog.setActioncontent(null);
+        Object[] args = joinPoint.getArgs();
+        HashMap map = new HashMap<>();
+        for (Object arg : args) {
+            System.out.println("aop获取的参数>>>>>>>"+arg.toString());
+        }
+        map = paramToMap(joinPoint);
+        Set<String> keySet=map.keySet();
+
+
+
+
         //获取操作类型
         OperationLogAnnotation myLog = method.getAnnotation(OperationLogAnnotation.class);
+
         if (myLog != null) {
             String value = myLog.operType();
             sysLog.setOperationtype(value);//保存获取的操作类型
-            System.out.println("Operationtype操作类型=" + value);
-        }
 
+        }
         //获取请求的类名
         String className = joinPoint.getTarget().getClass().getName();
 
@@ -108,415 +151,53 @@ public class OperationLogAspect {
         String methodName = myLog.operModul();
         ArrayList<String> list = new ArrayList();
 
-        //*
-        // 未确认机构编辑
-        // */
-        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("新增了活动业绩信息");
-                }
-
-            } else {
-                if (!highestAchievement.equals(A.cmClu.getHighestAchievement())) {
-                    list.add("修改了活动业绩的最高业绩信息");
-                }
-
-                if (Integer.parseInt(reachPepole) != A.cmClu.getReachPepole()) {
-                    list.add("修改了活动业绩的到店人数信息");
-                }
-                if (Integer.parseInt(clinchPepole) != A.cmClu.getClinchPepole()) {
-                    list.add("修改了活动业绩的成交人数信息");
-                }
-            }
-
-
-            if (A.cmClu.getConsumeA() == null || A.cmClu.getConsumeB() == null || A.cmClu.getConsumeC() == null) {
-                if (A.cmClu.getConsumeA() != null || A.cmClu.getConsumeB() != null || A.cmClu.getConsumeC() != null) {
-                    list.add("新增了会员消费金额信息");
-                }
-            } else {
-                BigDecimal cateAs = new BigDecimal(consumeA);
-                BigDecimal cateBs = new BigDecimal(consumeB);
-                BigDecimal cateCs = new BigDecimal(consumeC);
-                if (A.cmClu.getConsumeA() != cateAs) {
-                    list.add("修改了A类会员消费金额");
-                }
-                if (A.cmClu.getConsumeB() != cateBs) {
-                    list.add("修改了B类会员消费金额");
-                }
-                if (A.cmClu.getConsumeC() != cateCs) {
-                    list.add("修改了C类会员消费金额");
-                }
-            }
-
-
-            if (A.cmClu.getCateA() == null || A.cmClu.getCateB() == null || A.cmClu.getCateC() == null) {
-                if (!"".equals(cateA) || !"".equals(cateB) || !"".equals(cateC)) {
-                    list.add("新增了会员信息");
-                }
-            } else {
-                if (A.cmClu.getCateA() != Integer.parseInt(cateA)) {
-                    list.add("修改了A会员信息");
-                }
-                if (A.cmClu.getCateB() != Integer.parseInt(cateB)) {
-                    list.add("修改了B会员信息");
-                }
-                if (A.cmClu.getCateC() != Integer.parseInt(cateC)) {
-                    list.add("修改了C会员信息");
-                }
-            }
-
-
-            if ("".equals(A.cmClu.getMonthAchievement()) || "".equals(A.cmClu.getPromotionAchievement()) || "".equals(A.cmClu.getYearAchievement())) {
-                if (!"".equals(monthAchievement) || !"".equals(promotionAchievement) || !"".equals(yearAchievement)) {
-                    list.add("新增了业绩信息");
-                }
-
-            } else {
-                if (!monthAchievement.equals(A.cmClu.getMonthAchievement())) {
-                    list.add("修改了月业绩信息");
-                }
-
-                if (promotionAchievement != A.cmClu.getPromotionAchievement()) {
-                    list.add("修改了促销业绩信息");
-                }
-                if (yearAchievement != A.cmClu.getYearAchievement()) {
-                    list.add("修改了年业绩信息");
-                }
-            }
-
-
-            if (A.cmClu.getArea() == null || A.cmClu.getBedNums() == null || A.cmClu.getBeauticians() == null) {
-                if (!"".equals(area) || !"".equals(bedNums) || !"".equals(beauticians)) {
-                    list.add("更新了基本信息");
-                }
-            } else {
-                if (A.cmClu.getArea() != Integer.parseInt(area)) {
-                    list.add("修改了机构面积");
-                }
-                if (A.cmClu.getBedNums() != Integer.parseInt(bedNums)) {
-                    list.add("修改了美容床数");
-                }
-                if (A.cmClu.getBeauticians() != Integer.parseInt(beauticians)) {
-                    list.add("修改了美容师数");
-                }
-            }
-
-
-            if (A.newCm.getInfo() == null) {
-                if (!"".equals(info)) {
-                    list.add("新增了公司简介");
-                }
-            } else if (!A.newCm.getInfo().equals(info)) {
-                list.add("修改了公司简介");
-            }
-
-            if (empnum.equals(A.cmClu.getEmpnum())) {
-                list.add("更新了公司人数");
-            }
-
-            if (A.newCm.getFax() == null) {
-                if (!"".equals(fax)) {
-                    list.add("新增了传真");
-                }
-            } else if (!A.newCm.getFax().equals(fax)) {
-                list.add("修改了传真");
-            }
-
-
-            if (A.newCm.getContractPhone() == null) {
-                if (!"".equals(contractPhone)) {
-                    list.add("新增了固定电话");
-                }
-            } else if (!A.newCm.getContractPhone().equals(contractPhone)) {
-                list.add("修改了固定电话");
-            }
-
-
-            if (!A.newCm.getAddress().equals(address)) {
-                list.add("修改了详细地址");
-            }
-            if (Identity != null) {
-                if (A.newCm.getLinkManIdentity() != Integer.parseInt(Identity)) {
-                    list.add("修改了联系人身份");
-                }
-            }
-            if (A.newCm.getUserName() == null) {
-                if (uname != null) {
-                    list.add("新增了联系人");
-                }
-            }
-            if (!A.newCm.getUserName().equals(uname)) {
-                list.add("修改了联系人");
-            }
-
-
-            if (A.newCm.getFirstClubType() == null) {
-                if (ClubType != null) {
-                    list.add("新增了机构类型");
-                }
-            } else if (!A.newCm.getFirstClubType().equals(ClubType)) {
-                list.add("修改了机构类型");
-            }
-
-
-            if (A.newCm.getBusinessLicenseImage() == null) {
-                if (businessLicenseImage != null) {
-                    list.add("新增了营业执照");
-                }
-            } else {
-                if (!A.newCm.getBusinessLicenseImage().equals(businessLicenseImage)) {
-                    list.add("修改了营业执照");
-                }
-            }
-
-
-            if (A.newCm.getHeadpic() == null) {
-                if (headpic != null) {
-                    list.add("新增了门头照");
-                }
-                if (!A.newCm.getHeadpic().equals(headpic)) {
-                    list.add("修改了门头照");
-                }
-            }
-
-
-            if (A.newCm.getSocialCreditCode() == null) {
-                if (socialCreditCode != null) {
-                    list.add("新增了营业执照编号");
-                }
-                if (!A.newCm.getSocialCreditCode().equals(socialCreditCode)) {
-                    list.add("修改了营业执照编号");
-                }
-            }
-
-
-            if (A.newCm.getAddress() == null) {
-                if (address != null) {
-                    list.add("新增了详细地址");
-                }
-            }
-
-
-            if (A.newCm.getSname() == null) {
-                if (sname != null) {
-                    list.add("新增了机构简称");
-                }
-            }
-            if (!A.newCm.getSname().equals(sname)) {
-                list.add("修改了机构简称");
-            }
-
-            if (A.newCm.getName() == null) {
-                if (jgname != null) {
-                    list.add("新增了机构名称");
-                }
-            }
-            if (!A.newCm.getName().equals(jgname)) {
-                list.add("修改了机构名称");
-            }
-
-            if (A.newCm.getBindMobile() == null) {
-                if (bindm != null) {
-                    list.add("新增了手机号");
-                }
-            }
-            if (!A.newCm.getBindMobile().equals(bindm)) {
-                list.add("修改了手机号");
-            }
-
-            if (A.newCm.getContractEmail() == null) {
-                if (email != null) {
-                    list.add("新增了注册邮箱");
-                }
-            }
-            if (!A.newCm.getContractEmail().equals(email)) {
-                list.add("修改了邮箱");
-            }
-            sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
-        }
-        if (sysLog.getActioncontent() == null) {
-            sysLog.setActioncontent(methodName);
-        }
-        //获取操作时间
-        sysLog.setOperationtime(new Date());
-
-        //获取操作员
-        Principal principal = UserUtils.getPrincipal();
-        System.out.println("操作员" + principal.getName());
-        String username = principal.getName();
-        sysLog.setOperator(username);
 
         //获取机构名称和联系人
         String id = request.getParameter("id");
-        if ("编辑".equals(myLog.operType())) {
-            sysLog.setInstitutionName(jgname);
-            sysLog.setContact(uname);
-        }
-
-
-
-        if ("更换协销".equals(myLog.operType())) {
-            System.out.println("更换协销" + A.newCms.getLinkMan());
-            System.out.println("更换协销" + A.newCm.getLinkMan());
-            if (!"".equals(A.newCms.getLinkMan())) {
-                sysLog.setActioncontent(A.newCm.getLinkMan() + "更换为" + A.newCms.getLinkMan());
-            }
-            sysLog.setContact(A.newCm.getUserName());
-            sysLog.setInstitutionName(A.newCm.getLinkMan());
-        }
-
-
-        if ("设置机构类别".equals(myLog.operType())) {
-            System.out.println("机构类别" + A.types);
-            if ("1".equals(A.types)) {
-                sysLog.setActioncontent("设置为资质机构");
-            } else {
-                sysLog.setActioncontent("设置为个人机构");
-            }
-            sysLog.setContact(A.cmUs.getUserName());
-            sysLog.setInstitutionName(A.cmUs.getName());
-        }
+        sysLog.setOperationtime(new Date());
+        sysLog.setActioncontent(myLog.operModul());
+        sysLog.setOperationtype(myLog.operType());
 
+        
 
-        if ("审核".equals(myLog.operType())) {
-            System.out.println("审核" + A.cmUs.getAuditStatus());
-            if (StringUtils.equals("1", A.cmUs.getAuditStatus())) {
-                sysLog.setActioncontent("审核通过");
-            } else {
-                sysLog.setActioncontent("审核不通过");
-            }
-            sysLog.setContact(A.cmUs.getUserName());
-            sysLog.setInstitutionName(A.cmUs.getName());
-        }
 
 
-        if ("更改状态".equals(myLog.operType())) {
-            sysLog.setContact(A.cmUs.getUserName());
-            sysLog.setInstitutionName(A.cmUs.getName());
-        }
 
 
         if ("修改密码".equals(myLog.operType())) {
-            String Inst = A.cmUs.getName();
-            String Contact = A.cmUs.getUserName();
+            System.out.println(Integer.parseInt(map.get("id").toString())+">>>>>>>>"+Integer.parseInt(map.get("id").toString()));
+            String Inst = sysLogService.passName(Integer.parseInt(map.get("id").toString()));
+            String Contact = sysLogService.PasslinkMan(Integer.parseInt(map.get("id").toString()));
+            sysLog.setOperationtype(myLog.operModul());
+            sysLog.setOperationtype(myLog.operType());
             sysLog.setContact(Contact);
             sysLog.setInstitutionName(Inst);
         }
 
         if ("确认注册".equals(myLog.operType())) {
-            sysLog.setActioncontent(methodName);
+            sysLog.setActioncontent(myLog.operModul());
             ClubTemporary club = clubTemporaryService.get(id);
             if (club != null) {
-                String Inst = club.getLinkMan();
-                String Contact = club.getName();
+                String  Contact= club.getLinkMan();
+                String Inst = club.getName();
                 sysLog.setContact(Contact);
                 sysLog.setInstitutionName(Inst);
                 System.out.println("contact=" + sysLog.getContact());
             }
         }
 
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+        sysLog.setOperationtype(myLog.operType());
         //调用service保存SysLog实体类到数据库
         if (!"".equals(sysLog.getActioncontent())) {
-//            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+            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

@@ -1,316 +1,134 @@
-package com.caimei.modules.user.aop;
-
-import com.caimei.modules.user.entity.CmOperationalLogs;
-import com.caimei.modules.user.entity.CmUser;
-import com.caimei.modules.user.service.CmOperationUserService;
-import com.caimei.modules.user.service.CmOperationalLogService;
-import com.caimei.modules.user.service.CmUserService;
-import com.caimei.modules.user.service.SysLogService;
-import com.caimei.modules.user.utils.HttpContextUtils;
-import com.caimei.modules.user.web.NewCmShopController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
-import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
-import org.aspectj.lang.JoinPoint;
-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;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Date;
-
-@Aspect
-@Component
-public class OperationLogCmShop {
-
-    protected Logger logger = LoggerFactory.getLogger(getClass());
-    @Autowired
-    private CmOperationalLogService sysLogService;
-
-    @Autowired
-    private CmUserService cmUserService;
-
-    @Pointcut("@annotation(com.caimei.modules.user.aop.OperationLogShop)")
-    public void logPointCut() {
-
-    }
-
-    @AfterReturning("logPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) throws IOException {
-        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
-
-        CmOperationalLogs sysLog = new CmOperationalLogs();
-
-        //从切面织入点处通过反射机制获取织入点处的方法
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        //获取切入点所在的方法
-        Method method = signature.getMethod();
-        //获取操作类型
-        OperationLogShop oper = method.getAnnotation(OperationLogShop.class);
-
-        NewCmShopController A = new NewCmShopController();
-
-        ArrayList<String> list = new ArrayList();
-
-        String maintenanceFee = request.getParameter("maintenanceFee");//线上分账商户号
-        String name = request.getParameter("name");//公司名称
-        String sname = request.getParameter("sname");//公司简称
-        String address = request.getParameter("address");//公司地址
-        String linkMan = request.getParameter("linkMan");//修改后的联系人
-        String contractMobile = request.getParameter("contractMobile");//手机号
-        String email = request.getParameter("email");//邮箱
-        String contractPhone = request.getParameter("contractPhone");//固定电话
-        String fax = request.getParameter("fax");//传真
-        String legalPerson = request.getParameter("legalPerson");//法人代表：
-        String registeredCapital = request.getParameter("registeredCapital");//注册资本
-        String nature = request.getParameter("nature");//公司性质
-        String turnover = request.getParameter("turnover");//年营业额
-        String firstShopType = request.getParameter("firstShopType");//公司类型
-        String secondShopType = request.getParameter("secondShopType");//医疗类型
-        String mainpro = request.getParameter("mainpro");//主营内容
-        String businessScope = request.getParameter("businessScope");//经营范围
-        String website = request.getParameter("website");//官网地址
-        String wxOfficialAccount = request.getParameter("wxOfficialAccount");//微信公众号
-        String wxApplets = request.getParameter("wxApplets");//微信小程序
-        String socialCreditCode = request.getParameter("socialCreditCode");//营业执照编号
-        String businessLicenseImage = request.getParameter("businessLicenseImage");//营业执照图片
-        String logo = request.getParameter("logo");//公司logo
-
-        if (oper.operType().equals("编辑")) {
-
-            if (A.newcm.getMaintenanceFee() == "0") {
-                if (!maintenanceFee.equals("0")) {
-                    list.add("新增了线上分账商户号");
-                }
-            } else if (!A.newcm.getMaintenanceFee().equals(maintenanceFee)) {
-                list.add("修改了线上分账商户号");
-            }
-
-            if (A.newcm.getName() == null) {
-                if (!name.equals("")) {
-                    list.add("新增了公司名称");
-                }
-            } else if (!A.newcm.getName().equals(name)) {
-                list.add("修改了公司名称");
-            }
-
-            if (A.newcm.getSname() == null) {
-                if (!sname.equals("")) {
-                    list.add("新增了公司简称");
-                }
-            } else if (!A.newcm.getSname().equals(sname)) {
-                list.add("修改了公司简称");
-            }
-
-            if (A.newcm.getAddress() == null) {
-                if (!address.equals("")) {
-                    list.add("新增了公司地址");
-                }
-            } else if (!A.newcm.getAddress().equals(address)) {
-                list.add("修改了公司地址");
-            }
-
-            if (A.newcm.getLinkMan() == null) {
-                if (!linkMan.equals("")) {
-                    list.add("新增了联系人");
-                }
-            } else if (!A.newcm.getLinkMan().equals(linkMan)) {
-                list.add("修改了联系人");
-            }
-
-            if (A.newcm.getContractMobile() == null) {
-                if (!contractMobile.equals("")) {
-                    list.add("新增了手机号");
-                }
-            } else if (!A.newcm.getContractMobile().equals(contractMobile)) {
-                list.add("修改了手机号");
-            }
-
-            if (A.newcm.getEmail() == null) {
-                if (!email.equals("")) {
-                    list.add("新增了邮箱");
-                }
-            } else if (!A.newcm.getEmail().equals(email)) {
-                list.add("修改了邮箱");
-            }
-
-            if (A.newcm.getContractPhone() == null) {
-                if (!contractPhone.equals("")) {
-                    list.add("新增了固定电话");
-                }
-            } else if (!A.newcm.getContractPhone().equals(contractPhone)) {
-                list.add("修改了固定电话");
-            }
-
-            if (A.newcm.getFax() == null) {
-                if (!fax.equals("")) {
-                    list.add("新增了传真");
-                }
-            } else if (!A.newcm.getFax().equals(fax)) {
-                list.add("修改了传真");
-            }
-
-            if (A.newcm.getLegalPerson() == null) {
-                if (!legalPerson.equals("")) {
-                    list.add("新增了法人代表");
-                }
-            } else if (!A.newcm.getLegalPerson().equals(legalPerson)) {
-                list.add("修改了法人代表");
-            }
-
-            if (A.newcm.getRegisteredCapital() == null) {
-                if (!registeredCapital.equals("")) {
-                    list.add("新增了注册资本");
-                }
-            }
-            if (registeredCapital != "") {
-                    logger.info("***********"+A.newcm.getRegisteredCapital()+"+++++++++++++"+ Double.parseDouble(registeredCapital));
-                if (A.newcm.getRegisteredCapital() != Double.parseDouble(registeredCapital)) {
-                    list.add("修改了注册资本");
-                }
-            }
-            if (A.newcm.getNature() == null) {
-                if (!nature.equals("")) {
-                    list.add("新增了公司性质");
-                }
-            } else if (!A.newcm.getNature().equals(nature)) {
-                list.add("修改了公司性质");
-            }
-
-            if (A.newcm.getTurnover() == null) {
-                if (!turnover.equals("")) {
-                    list.add("新增了年营业额");
-                }
-            } else if (!A.newcm.getTurnover().equals(turnover)) {
-                list.add("修改了年营业额");
-            }
-
-            if (A.newcm.getFirstShopType() == null) {
-                if (!firstShopType.equals("")) {
-                    list.add("新增了公司类型");
-                }
-            } else if (!A.newcm.getFirstShopType().equals(firstShopType)) {
-                list.add("修改了公司类型");
-            }
-
-            if (A.newcm.getSecondShopType() == null) {
-                if (!secondShopType.equals("")) {
-                    list.add("新增了医疗类型");
-                }
-            } else if (!A.newcm.getSecondShopType().equals(secondShopType)) {
-                list.add("修改了医疗类型");
-            }
-
-            if (A.newcm.getMainpro() == null) {
-                if (!mainpro.equals("")) {
-                    list.add("新增了主营内容");
-                }
-            } else if (!A.newcm.getMainpro().equals(mainpro)) {
-                list.add("修改了主营内容");
-            }
-
-            if (A.newcm.getBusinessScope() == null) {
-                if (!businessScope.equals("")) {
-                    list.add("新增了医疗类型");
-                }
-            } else if (!A.newcm.getBusinessScope().equals(businessScope)) {
-                list.add("修改了医疗类型");
-            }
-
-            if (A.newcm.getWebsite() == null) {
-                if (!website.equals("")) {
-                    list.add("新增了官网地址");
-                }
-            } else if (!A.newcm.getWebsite().equals(website)) {
-                list.add("修改了官网地址");
-            }
-
-            if (A.newcm.getWxOfficialAccount() == null) {
-                if (!wxOfficialAccount.equals("")) {
-                    list.add("新增了微信公众号");
-                }
-            } else if (!A.newcm.getWxOfficialAccount().equals(wxOfficialAccount)) {
-                list.add("修改了微信公众号");
-            }
-
-            if (A.newcm.getWxApplets() == null) {
-                if (!wxApplets.equals("")) {
-                    list.add("新增了微信小程序");
-                }
-            } else if (!A.newcm.getWxApplets().equals(wxApplets)) {
-                list.add("修改了微信小程序");
-            }
-
-            if (A.newcm.getSocialCreditCode() == null) {
-                if (!socialCreditCode.equals("")) {
-                    list.add("新增了营业执照编号");
-                }
-            } else if (!A.newcm.getSocialCreditCode().equals(socialCreditCode)) {
-                list.add("修改了营业执照编号");
-            }
-
-            if (A.newcm.getBusinessLicenseImage() == null) {
-                if (!businessLicenseImage.equals("")) {
-                    list.add("新增了营业执照图片");
-                }
-            } else if (!A.newcm.getBusinessLicenseImage().equals(businessLicenseImage)) {
-                list.add("修改了营业执照图片");
-            }
-
-            if (A.newcm.getLogo() == null) {
-                if (!logo.equals("")) {
-                    list.add("新增了营业执照图片");
-                }
-            } else if (!A.newcm.getLogo().equals(logo)) {
-                list.add("修改了营业执照图片");
-            }
-            sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
-        }
-        sysLog.setInstitutionName(name);
-        sysLog.setContact(linkMan);
-
-
-        sysLog.setOperationtime(new Date());
-        sysLog.setOperationtype(oper.operType());
-
-        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
-        System.out.println("操作员" + principal.getName());
-        String username = principal.getName();
-        sysLog.setOperator(username);
-
-        if (oper.operType().equals("更改状态")) {
-            CmUser cmUser = cmUserService.get(String.valueOf(A.id));
-            sysLog.setInstitutionName(cmUser.getName());
-            sysLog.setActioncontent(oper.operModul());
-            sysLog.setContact(cmUser.getUserName());
-        }
-
-        if (oper.operType().equals("修改密码")) {
-            sysLog.setInstitutionName(A.cmus.getName());
-            sysLog.setActioncontent(oper.operModul());
-            sysLog.setContact(A.cmus.getUserName());
-        }
-        if (oper.operType().equals("审核")) {
-            sysLog.setInstitutionName(A.cmus.getName());
-            if(StringUtils.equals("1", A.auditNo)){sysLog.setActioncontent("审核通过");}
-            if (StringUtils.equals("2", A.auditNo)){ sysLog.setActioncontent("审核不通过");}
-            sysLog.setContact(A.cmus.getUserName());
-        }
-
-
-        System.out.println(sysLog.getInstitutionName());
-        if (!"".equals(sysLog.getActioncontent())) {
-                int i = sysLogService.insert(sysLog);
-                list.removeAll(list);
-        }
-    }
-}
+//package com.caimei.modules.user.aop;
+//
+//import com.caimei.modules.user.entity.CmOperationalLogs;
+//import com.caimei.modules.user.entity.CmUser;
+//import com.caimei.modules.user.service.CmOperationUserService;
+//import com.caimei.modules.user.service.CmOperationalLogService;
+//import com.caimei.modules.user.service.CmUserService;
+//import com.caimei.modules.user.service.SysLogService;
+//import com.caimei.modules.user.utils.HttpContextUtils;
+//import com.caimei.modules.user.web.NewCmShopController;
+//import com.thinkgem.jeesite.common.utils.StringUtils;
+//import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
+//import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+//import org.aspectj.lang.JoinPoint;
+//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;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import java.io.IOException;
+//import java.lang.reflect.Method;
+//import java.util.ArrayList;
+//import java.util.Date;
+//
+//@Aspect
+//@Component
+//public class OperationLogCmShop {
+//
+//    protected Logger logger = LoggerFactory.getLogger(getClass());
+//    @Autowired
+//    private CmOperationalLogService sysLogService;
+//
+//    @Autowired
+//    private CmUserService cmUserService;
+//
+//    @Pointcut("@annotation(com.caimei.modules.user.aop.OperationLogShop)")
+//    public void logPointCut() {
+//
+//    }
+//
+//    @AfterReturning("logPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) throws IOException {
+//        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+//
+//        CmOperationalLogs sysLog = new CmOperationalLogs();
+//
+//        //从切面织入点处通过反射机制获取织入点处的方法
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        //获取切入点所在的方法
+//        Method method = signature.getMethod();
+//        //获取操作类型
+//        OperationLogShop oper = method.getAnnotation(OperationLogShop.class);
+//
+//        NewCmShopController A = new NewCmShopController();
+//
+//        ArrayList<String> list = new ArrayList();
+//
+//        String maintenanceFee = request.getParameter("maintenanceFee");//线上分账商户号
+//        String name = request.getParameter("name");//公司名称
+//        String sname = request.getParameter("sname");//公司简称
+//        String address = request.getParameter("address");//公司地址
+//        String linkMan = request.getParameter("linkMan");//修改后的联系人
+//        String contractMobile = request.getParameter("contractMobile");//手机号
+//        String email = request.getParameter("email");//邮箱
+//        String contractPhone = request.getParameter("contractPhone");//固定电话
+//        String fax = request.getParameter("fax");//传真
+//        String legalPerson = request.getParameter("legalPerson");//法人代表：
+//        String registeredCapital = request.getParameter("registeredCapital");//注册资本
+//        String nature = request.getParameter("nature");//公司性质
+//        String turnover = request.getParameter("turnover");//年营业额
+//        String firstShopType = request.getParameter("firstShopType");//公司类型
+//        String secondShopType = request.getParameter("secondShopType");//医疗类型
+//        String mainpro = request.getParameter("mainpro");//主营内容
+//        String businessScope = request.getParameter("businessScope");//经营范围
+//        String website = request.getParameter("website");//官网地址
+//        String wxOfficialAccount = request.getParameter("wxOfficialAccount");//微信公众号
+//        String wxApplets = request.getParameter("wxApplets");//微信小程序
+//        String socialCreditCode = request.getParameter("socialCreditCode");//营业执照编号
+//        String businessLicenseImage = request.getParameter("businessLicenseImage");//营业执照图片
+//        String logo = request.getParameter("logo");//公司logo
+//
+//
+//
+//
+//        sysLog.setInstitutionName(name);
+//        sysLog.setContact(linkMan);
+//
+//
+//        sysLog.setOperationtime(new Date());
+//        sysLog.setOperationtype(oper.operType());
+//
+//        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+//        System.out.println("操作员" + principal.getName());
+//        String username = principal.getName();
+//        sysLog.setOperator(username);
+//
+////        if (oper.operType().equals("更改状态")) {
+////            sysLog.setOperationtime(new Date());
+////            sysLog.setOperationtype(oper.operType());
+////            CmUser cmUser = cmUserService.get(String.valueOf(A.id));
+////            sysLog.setInstitutionName(cmUser.getName());
+////            sysLog.setActioncontent(oper.operModul());
+////            sysLog.setContact(cmUser.getUserName());
+////        }
+//
+////        if (oper.operType().equals("修改密码")) {
+////            sysLog.setOperationtime(new Date());
+////            sysLog.setOperationtype(oper.operType());
+////            sysLog.setInstitutionName(A.cmus.getName());
+////            sysLog.setActioncontent(oper.operModul());
+////            sysLog.setContact(A.cmus.getUserName());
+////            if (!"".equals(sysLog.getActioncontent())) {
+////                int i = sysLogService.insert(sysLog);
+////                list.removeAll(list);
+////            }
+////        }
+//        if (oper.operType().equals("审核")) {
+//
+//        }
+//
+//
+//        System.out.println(sysLog.getInstitutionName());
+//        if (!"".equals(sysLog.getActioncontent())) {
+//                int i = sysLogService.insert(sysLog);
+//                list.removeAll(list);
+//        }
+//    }
+//}

src/main/java/com/caimei/modules/user/dao/CmClubinfoDao.java

@@ -15,4 +15,5 @@ public interface CmClubinfoDao extends CrudDao<CmClubinfo> {
 
     CmClubinfo getClubInfoByClubID(@Param("clubID") Integer clubID);
 
-}
+     int insert(CmClubinfo cmClubinfo);
+}

src/main/java/com/caimei/modules/user/dao/CmOperationsDao.java

@@ -2,10 +2,12 @@ package com.caimei.modules.user.dao;
 
 import com.caimei.modules.user.entity.CmOperationalLogs;
 
+import com.caimei.modules.user.entity.NewCmShop;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 
 @MyBatisDao
 public interface CmOperationsDao extends CrudDao<CmOperationalLogs> {
+    NewCmShop shoplist(Integer shopID);
 
 }

src/main/java/com/caimei/modules/user/dao/OperationsDao.java

@@ -1,11 +1,32 @@
 package com.caimei.modules.user.dao;
 
-import com.caimei.modules.user.entity.NewCmShop;
-import com.caimei.modules.user.entity.OperationalLogs;
+import com.caimei.modules.user.entity.*;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 
 @MyBatisDao
 public interface OperationsDao extends CrudDao<OperationalLogs> {
 
+   String ClubName(Integer clubChangeSpRecordID);
+
+   String ClubsName(Integer clubChangeSpRecordID);
+
+   String JgName(Integer clubChangeSpRecordID);
+
+   String linkMan(Integer clubChangeSpRecordID);
+
+   String passName(Integer userID);
+
+   String PasslinkMan(Integer userID);
+
+   String auditName(Integer clubID);
+
+   String auditlinkMan(Integer clubID);
+
+   NewCmClub newCmClub(Integer clubId);
+
+   CmClubinfo cmclubinfo(Integer clubId);
+
+   ClubTemporary temPorary(String Id);
 }
+

src/main/java/com/caimei/modules/user/entity/CmClubinfo.java

@@ -44,7 +44,7 @@ public class CmClubinfo extends DataEntity<CmClubinfo> {
     private Integer clinchPepole;        // 成交人数
     private Date createTime;        // 创建时间
     private Date updateTime;        // 修改时间
-
+    private Integer empnum; // 员工数
     /**
      * 非持久化字段
      */
@@ -57,7 +57,6 @@ public class CmClubinfo extends DataEntity<CmClubinfo> {
     private String address;        // 详细地址
     private String contractPhone;        // 联系电话
     private String fax;        // 传真
-    private Integer empnum;        // 员工数
     private String info;        // 公司简介
     private String firstClubType;  //一级分类为医美=1和生美=2
     private String secondClubType;  //医美的二级分类为诊所=1、门诊=2、医院=3。 生美没有二级分类

src/main/java/com/caimei/modules/user/entity/CmOperationalLogs.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.thinkgem.jeesite.common.persistence.DataEntity;
 
 import java.util.Date;
@@ -11,8 +12,24 @@ public class CmOperationalLogs extends DataEntity<CmOperationalLogs> {
     private String Actioncontent;
     private String Operator;
     private Date Operationtime;
+    private String startTime;     //添加时间开始 查询条件
+    private String endTime;        //添加时间结束  查询条件
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
 
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public String getInstitutionName() {
         return institutionName;
@@ -56,7 +73,7 @@ public class CmOperationalLogs extends DataEntity<CmOperationalLogs> {
     public void setOperator(String operator) {
         Operator = operator;
     }
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getOperationtime() {
         return Operationtime;
     }

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -89,11 +89,9 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String endTime;        //注册时间结束  查询条件
     private String userIdentity;  //用户身份
     private Integer svipUserFlag;   //超级会员用户标识，1是，2不是
-
     public String getCheckMan() {
         return checkMan;
     }
-
     public void setCheckMan(String checkMan) {
         this.checkMan = checkMan;
     }

src/main/java/com/caimei/modules/user/entity/NewCmShop.java

@@ -95,7 +95,6 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private String editStatus;//1编辑，2审核
     private String source; //注册来源: 0网站 1小程序
 
-
     public NewCmShop() {
         super();
     }

src/main/java/com/caimei/modules/user/entity/OperationalLogs.java

@@ -13,8 +13,24 @@ public class OperationalLogs extends DataEntity<OperationalLogs> {
   private String Actioncontent;
   private String Operator;
   private Date Operationtime;
+  private String startTime;     //添加时间开始 查询条件
+  private String endTime;        //添加时间结束  查询条件
 
+  public String getStartTime() {
+    return startTime;
+  }
+
+  public void setStartTime(String startTime) {
+    this.startTime = startTime;
+  }
 
+  public String getEndTime() {
+    return endTime;
+  }
+
+  public void setEndTime(String endTime) {
+    this.endTime = endTime;
+  }
 
   public String getInstitutionName() {
     return institutionName;

src/main/java/com/caimei/modules/user/service/CmClubinfoService.java

@@ -23,23 +23,28 @@ public class CmClubinfoService extends CrudService<CmClubinfoDao, CmClubinfo> {
 	@Autowired
 	CmClubinfoDao cmClubinfoDao;
 
+	@Transactional(readOnly = false)
+    public int insert(CmClubinfo cmClubinfo){
+		return cmClubinfoDao.insert(cmClubinfo);
+	}
+
 	public CmClubinfo get(String id) {
 		return super.get(id);
 	}
-	
+
 	public List<CmClubinfo> findList(CmClubinfo cmClubinfo) {
 		return super.findList(cmClubinfo);
 	}
-	
+
 	public Page<CmClubinfo> findPage(Page<CmClubinfo> page, CmClubinfo cmClubinfo) {
 		return super.findPage(page, cmClubinfo);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void save(CmClubinfo cmClubinfo) {
 		super.save(cmClubinfo);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void delete(CmClubinfo cmClubinfo) {
 		super.delete(cmClubinfo);
@@ -49,4 +54,4 @@ public class CmClubinfoService extends CrudService<CmClubinfoDao, CmClubinfo> {
 		return cmClubinfoDao.getClubInfoByClubID(clubID);
 	}
 
-}
+}

src/main/java/com/caimei/modules/user/service/CmOperationalLogService.java

@@ -3,6 +3,7 @@ package com.caimei.modules.user.service;
 import com.caimei.modules.user.dao.CmOperationsDao;
 import com.caimei.modules.user.dao.OperationsDao;
 import com.caimei.modules.user.entity.CmOperationalLogs;
+import com.caimei.modules.user.entity.NewCmShop;
 import com.caimei.modules.user.entity.OperationalLogs;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
@@ -18,6 +19,10 @@ public class CmOperationalLogService extends CrudService<CmOperationsDao, CmOper
     @Autowired
     CmOperationsDao cmoperationDao;
 
+    @Transactional(readOnly = false)
+    public NewCmShop shoplist(Integer shop) {
+        return cmoperationDao.shoplist(shop);
+    }
 
     @Transactional(readOnly = false)
     public List<CmOperationalLogs> findList(CmOperationalLogs cmoperationalLogs) {

src/main/java/com/caimei/modules/user/service/SysLogService.java

@@ -1,6 +1,9 @@
 package com.caimei.modules.user.service;
 
 import com.caimei.modules.user.dao.OperationsDao;
+import com.caimei.modules.user.entity.ClubTemporary;
+import com.caimei.modules.user.entity.CmClubinfo;
+import com.caimei.modules.user.entity.NewCmClub;
 import com.caimei.modules.user.entity.OperationalLogs;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
@@ -18,6 +21,58 @@ public class SysLogService extends CrudService<OperationsDao, OperationalLogs> {
     @Autowired
     OperationsDao operationDao;
 
+    @Transactional(readOnly = false)
+    public NewCmClub newCmClub(Integer clubID) {
+        return operationDao.newCmClub(clubID);
+    }
+
+    @Transactional(readOnly = false)
+    public ClubTemporary temPorary(String id) {
+        return operationDao.temPorary(id);
+    }
+
+    @Transactional(readOnly = false)
+    public CmClubinfo cmclubinfo(Integer clubID) {
+        return operationDao.cmclubinfo(clubID);
+    }
+
+    @Transactional(readOnly = false)
+    public String auditlinkMan(Integer userID) {
+        return operationDao.auditlinkMan(userID);
+    }
+
+    @Transactional(readOnly = false)
+    public String auditName(Integer userID) {
+        return operationDao.auditName(userID);
+    }
+
+    @Transactional(readOnly = false)
+    public String PasslinkMan(Integer userID) {
+        return operationDao.PasslinkMan(userID);
+    }
+
+    @Transactional(readOnly = false)
+    public String passName(Integer userID) {
+        return operationDao.passName(userID);
+    }
+
+    @Transactional(readOnly = false)
+    public String ClubName(Integer clubChangeSpRecordID) {
+        return operationDao.ClubName(clubChangeSpRecordID);
+    }
+    @Transactional(readOnly = false)
+    public String JgName(Integer clubChangeSpRecordID) {
+        return operationDao.JgName(clubChangeSpRecordID);
+    }
+    @Transactional(readOnly = false)
+    public String linkMan(Integer clubChangeSpRecordID) {
+        return operationDao.linkMan(clubChangeSpRecordID);
+    }
+
+    @Transactional(readOnly = false)
+    public String ClubsName(Integer clubChangeSpRecordID) {
+        return operationDao.ClubsName(clubChangeSpRecordID);
+    }
 
     @Transactional(readOnly = false)
     public List<OperationalLogs> findList( OperationalLogs operationalLogs) {

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

@@ -3,11 +3,15 @@ package com.caimei.modules.user.web;
 import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.entity.ClubConfirmRecord;
 import com.caimei.modules.user.entity.ClubTemporary;
+import com.caimei.modules.user.entity.OperationalLogs;
 import com.caimei.modules.user.service.ClubTemporaryService;
+import com.caimei.modules.user.service.SysLogService;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -19,6 +23,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,6 +39,8 @@ public class ClubTemporaryController extends BaseController {
 
     @Autowired
     private ClubTemporaryService clubTemporaryService;
+    @Autowired
+    private SysLogService sysLogService;
 
     public static ClubTemporary clubT;
 
@@ -66,13 +74,122 @@ public class ClubTemporaryController extends BaseController {
 
 
     @RequestMapping(value = "save")
-    @OperationLogAnnotation(operType = "编辑",operModul = "进行了未确认机构编辑",oper = "1")
     public String save(ClubTemporary clubTemporary, Model model, RedirectAttributes redirectAttributes) {
+        ClubTemporary clubTemporarys=sysLogService.temPorary(clubTemporary.getId());
+        ArrayList<String> list = new ArrayList();
+        OperationalLogs sysLog = new OperationalLogs();
+        System.out.println("<<<<<<<<<<<<<<<<<,"+clubTemporarys);
+        System.out.println(">>>>>>>>>>>>>>>>>>"+clubTemporary);
+        if ("".equals(clubTemporarys.getLinkMan())) {
+            sysLog.setContact(clubTemporarys.getLinkMan());
+        }
+
+        if (clubTemporarys.getLinkMan() == null) {
+            if (clubTemporary.getLinkMan() != null) {
+                list.add("新增了联系人");
+            }
+        }
+        if (!clubTemporary.getLinkMan().equals(clubTemporarys.getLinkMan())) {
+            list.add("修改了联系人");
+        }
+        if (clubTemporarys.getShortName() == null) {
+            if (clubTemporary.getShortName() != null) {
+                list.add("新增了机构简称");
+            }
+        }
+        if (!clubTemporary.getShortName().equals(clubTemporarys.getShortName())) {
+            list.add("修改了机构简称");
+        }
+
+        if (clubTemporarys.getName() == null) {
+            if (clubTemporary.getName() != null) {
+                list.add("新增了机构名称");
+            }
+        }
+        if (!clubTemporary.getName().equals(clubTemporarys.getName())) {
+            list.add("修改了机构名称");
+        }
+
+        if (clubTemporarys.getBindMobile() == null) {
+            if (clubTemporary.getBindMobile() != null) {
+                list.add("新增了手机号");
+            }
+        }
+        if (!clubTemporary.getBindMobile().equals(clubTemporarys.getBindMobile())) {
+            list.add("修改了手机号");
+        }
+
+        if (clubTemporarys.getContractEmail() == null) {
+            if (clubTemporarys.getContractEmail() != null) {
+                list.add("新增邮箱");
+            }
+        }
+        if (!clubTemporary.getContractEmail().equals(clubTemporarys.getContractEmail())) {
+            list.add("修改了邮箱");
+        }
+        if (!clubTemporary.getAddress().equals(clubTemporarys.getAddress())) {
+            list.add("修改了详细地址");
+        }
+        if (clubTemporarys.getBusinessLicense() == null) {
+            if (clubTemporary.getBusinessLicense() != null) {
+                list.add("新增了营业执照");
+            }
+        } else {
+            if (!clubTemporary.getBusinessLicense().equals(clubTemporarys.getBusinessLicense())){
+                list.add("修改了营业执照");
+            }
+        }
+
+        if (clubTemporarys.getShopPhoto() == null) {
+            if (clubTemporary.getShopPhoto()!=null) {
+                list.add("新增了门头照");
+            }
+            if (!clubTemporary.getShopPhoto().equals(clubTemporarys.getShopPhoto())) {
+                list.add("修改了门头照");
+            }
+        }
+
+
+        if (clubTemporarys.getSocialCreditCode() == null) {
+            if (clubTemporary.getSocialCreditCode() != null) {
+                list.add("新增了营业执照编号");
+            }
+            if (!clubTemporary.getSocialCreditCode().equals(clubTemporarys.getSocialCreditCode())) {
+                list.add("修改了营业执照编号");
+            }
+        }
+        if (clubTemporarys.getFirstClubType() == null) {
+            if (clubTemporary.getFirstClubType() != null) {
+                list.add("新增了机构类型");
+            }
+        } else if (!clubTemporary.getFirstClubType().equals(clubTemporarys.getFirstClubType())) {
+            list.add("修改了机构类型");
+        }
+        sysLog.setInstitutionName(clubTemporary.getName());
+        sysLog.setContact(clubTemporary.getLinkMan());
+        sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
+        //获取操作时间
+        sysLog.setOperationtime(new Date());
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        sysLog.setOperationtype("编辑");
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+
+        //调用service保存SysLog实体类到数据库
+        if (!"".equals(sysLog.getActioncontent())) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+                list.removeAll(list);
+            }
+        }
+
+
+
         if (!beanValidator(model, clubTemporary)) {
             return form(clubTemporary, model);
         }
         clubTemporaryService.save(clubTemporary);
-        clubT=clubTemporary;
         addMessage(redirectAttributes, "保存未确认机构成功");
         return "redirect:" + Global.getAdminPath() + "/user/clubTemporary/?repage";
     }

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

@@ -4,6 +4,7 @@ import com.caimei.constants.ServiceProviderStatus;
 import com.caimei.constants.UserIdentity;
 import com.caimei.constants.UserType;
 import com.caimei.modules.sys.utils.ValidateUtils;
+import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.dao.CmSpDao;
 import com.caimei.modules.user.entity.CmMessage;
 import com.caimei.modules.user.entity.CmUser;

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @Controller
 @RequestMapping(value = "${adminPath}/user/cmOperational")
@@ -27,8 +28,8 @@ public class OperationalLogsController extends BaseController {
 //        List<OperationalLogs> operational = sysLogService.findList(new OperationalLogs());
         Page<OperationalLogs> page= sysLogService.findPage(new Page<OperationalLogs>(request, response), operationalLogs);
         model.addAttribute("page", page);
-        model.addAttribute("operationalLogs", operationalLogs);
-//        System.out.println("输出"+operational);
+        model.addAttribute("pagelist", page);
+        System.out.println("输出>>>>>>>>>>>>>>>>>>>>>>>>>"+operationalLogs);
 
         return "/modules/user/cmOperationalLogs";
 //        return "modules/user/cmOperationalLogs";

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

@@ -22,6 +22,7 @@ import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,6 +38,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -74,11 +76,13 @@ public class AgencyController extends BaseController {
     CmSpService cmSpService;
     @Autowired
     private CmOperationUserService cmOperationUserService;
+    @Autowired
+    private SysLogService sysLogService;
 
     public static NewCmClub newCm;
     public static CmClubinfo cmClu;
     public static CmUser cmUs;
-    public static  String types;
+    public static String types;
     public static NewCmSp newCms;
 
     @ModelAttribute
@@ -197,38 +201,55 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "online")
-    @OperationLogAnnotation(operType = "更改状态",operModul = "设置为已上线")
+//    @OperationLogAnnotation(operType = "更改状态", operModul = "设置为已上线")
     @RequiresPermissions("user:newCmClub:edit")
     public String onLine(NewCmClub newCmClub, Model model, RedirectAttributes redirectAttributes) {
-        Integer companyUserID = newCmClub.getUserID();
-        CmUser cmUser = cmUserService.get(companyUserID + "");
-        if (null != cmUser) {
-            cmUser.setClubStatus(ClubStatus.ONLINE.getCode() + "");
-            cmUser.setValidFlag(AppKeys.FLAG_YES);//解除冻结
-            cmUser.setUserPermission(2);
-            cmUs=cmUser;
-            //更新所有企业员工状态
-            cmUserService.updateEmployeeStatus(null, ClubStatus.ONLINE.getCode() + "", null, "1", companyUserID);
-            //更新所有审核过的企业员工权限
-            cmUserService.updateEmployeePermission(2, companyUserID);
-            cmUserService.update(cmUser);
-        } else {
-            addMessage(redirectAttributes, "上线失败，用户信息异常");
-            return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+        OperationalLogs sysLog = new OperationalLogs();
+        sysLog.setOperationtime(new Date());
+        sysLog.setContact(newCmClub.getLinkMan());
+        sysLog.setInstitutionName(newCmClub.getName());
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+        sysLog.setOperationtype("更改状态");
+        sysLog.setActioncontent("设置为已上线");
+        //调用service保存SysLog实体类到数据库
+        if (!"".equals(sysLog.getActioncontent())) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+            }
         }
-        newCmClub.setStatus(ClubStatus.ONLINE.getCode());
-        newCmClubService.update(newCmClub);
-        addMessage(redirectAttributes, "机构上线成功");
-        redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
-        redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
-        redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
-        redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
-        redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
-        redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
-        redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
-        redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
-        redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
-        return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+
+            Integer companyUserID = newCmClub.getUserID();
+            CmUser cmUser = cmUserService.get(companyUserID + "");
+            if (null != cmUser) {
+                cmUser.setClubStatus(ClubStatus.ONLINE.getCode() + "");
+                cmUser.setValidFlag(AppKeys.FLAG_YES);//解除冻结
+                cmUser.setUserPermission(2);
+                //更新所有企业员工状态
+                cmUserService.updateEmployeeStatus(null, ClubStatus.ONLINE.getCode() + "", null, "1", companyUserID);
+                //更新所有审核过的企业员工权限
+                cmUserService.updateEmployeePermission(2, companyUserID);
+                cmUserService.update(cmUser);
+            } else {
+                addMessage(redirectAttributes, "上线失败，用户信息异常");
+                return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+            }
+            newCmClub.setStatus(ClubStatus.ONLINE.getCode());
+            newCmClubService.update(newCmClub);
+            addMessage(redirectAttributes, "机构上线成功");
+            redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
+            redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
+            redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
+            redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
+            redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
+            redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
+            redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
+            redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
+            redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
+            return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+
     }
 
     /**
@@ -240,7 +261,6 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "offline")
-    @OperationLogAnnotation(operType = "更改状态",operModul = "设置为已下线")
     @RequiresPermissions("user:newCmClub:edit")
     public String offLine(NewCmClub newCmClub, Model model, RedirectAttributes redirectAttributes) {
         Integer companyUserID = newCmClub.getUserID();
@@ -249,28 +269,46 @@ public class AgencyController extends BaseController {
             cmUser.setClubStatus(ClubStatus.FREEZE.getCode() + "");
             cmUser.setValidFlag(AppKeys.FLAG_NO);//冻结
             cmUser.setUserPermission(0);
-            cmUs=cmUser;
-            //更新所有企业员工状态 设置未提示
-            cmUserService.updateEmployeeStatus(1, ClubStatus.ONLINE.getCode() + "", null, "0", companyUserID);
-            cmUserService.update(cmUser);
-        } else {
-            addMessage(redirectAttributes, "下线失败，用户信息异常");
+
+            OperationalLogs sysLog = new OperationalLogs();
+            sysLog.setOperationtime(new Date());
+            sysLog.setContact(newCmClub.getLinkMan());
+            sysLog.setInstitutionName(newCmClub.getName());
+            SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+            System.out.println("操作员" + principal.getName());
+            String username = principal.getName();
+            sysLog.setOperator(username);
+            sysLog.setOperationtype("更改状态");
+            sysLog.setActioncontent("设置为已下线");
+            //调用service保存SysLog实体类到数据库
+            if (!"".equals(sysLog.getActioncontent())) {
+                if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                    int i = sysLogService.insert(sysLog);
+                }
+            }
+
+                //更新所有企业员工状态 设置未提示
+                cmUserService.updateEmployeeStatus(1, ClubStatus.ONLINE.getCode() + "", null, "0", companyUserID);
+                cmUserService.update(cmUser);
+            } else {
+                addMessage(redirectAttributes, "下线失败，用户信息异常");
+                return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
+            }
+            newCmClub.setStatus(ClubStatus.FREEZE.getCode());
+            newCmClubService.update(newCmClub);
+            addMessage(redirectAttributes, "机构下线成功");
+            redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
+            redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
+            redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
+            redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
+            redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
+            redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
+            redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
+            redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
+            redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
             return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
         }
-        newCmClub.setStatus(ClubStatus.FREEZE.getCode());
-        newCmClubService.update(newCmClub);
-        addMessage(redirectAttributes, "机构下线成功");
-        redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
-        redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
-        redirectAttributes.addAttribute("searchBindMobile", newCmClub.getSearchBindMobile());
-        redirectAttributes.addAttribute("searchEmail", newCmClub.getSearchEmail());
-        redirectAttributes.addAttribute("searchUserOrganizeID", newCmClub.getSearchUserOrganizeID());
-        redirectAttributes.addAttribute("searchStatus", newCmClub.getSearchStatus());
-        redirectAttributes.addAttribute("searchUserIdentity", newCmClub.getSearchUserIdentity());
-        redirectAttributes.addAttribute("searchStartTime", newCmClub.getSearchStartTime());
-        redirectAttributes.addAttribute("searchEndTime", newCmClub.getSearchEndTime());
-        return "redirect:" + Global.getAdminPath() + "/new/user/agency/?repage";
-    }
+
 
     /**
      * 查看机构
@@ -312,11 +350,9 @@ public class AgencyController extends BaseController {
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
         cmClubinfo.setContractEmail(newCmClub.getContractEmail());
         cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
-        newCm = newCmClub;
-        cmClu = cmClubinfo;
-
         model.addAttribute("cmClubinfo", cmClubinfo);
         model.addAttribute("newCmClub", newCmClub);
+
         String wwwServer = Global.getConfig("wwwServer");
         //营业执照
         newCmClub.setBusinessLicenseImage(AppUtils.getImageURL("clubBusinessLicenseImage", newCmClub.getBusinessLicenseImage(), 0, wwwServer));
@@ -335,9 +371,269 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "save")
-    @OperationLogAnnotation(operType = "编辑" ,oper = "2")
     @RequiresPermissions("user:newCmClub:edit")
     public String save(NewCmClub newCmClub, CmClubinfo cmClubinfo, Model model, RedirectAttributes redirectAttributes) {
+        ArrayList<String> list = new ArrayList();
+         OperationalLogs sysLog = new OperationalLogs();
+        NewCmClub newCmClubs = sysLogService.newCmClub(newCmClub.getClubID());
+        System.out.println("id>>>>>>>>>>"+ newCmClub.getClubID()+"<<<<<"+cmClubinfo.getUserID());
+        CmClubinfo cmClubinfos = sysLogService.cmclubinfo(cmClubinfo.getClubInfoID());
+
+        logger.info("newCmClub页面数据"+newCmClub);
+        logger.info("newCmClub数据库数据"+newCmClubs);
+        logger.info("cmClubinfo页面数据"+cmClubinfo);
+        logger.info("cmClubinfo数据库数据"+cmClubinfos);
+       //编辑时添加操作日志
+        if(cmClubinfos!=null) {
+            if (null == (cmClubinfos.getHighestAchievement()) || null == cmClubinfos.getReachPepole() || null == cmClubinfos.getClinchPepole()) {
+                if (!"".equals(cmClubinfo.getHighestAchievement())  || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
+                    list.add("新增了活动业绩信息");
+                }
+
+            } else {
+                if (!cmClubinfo.getHighestAchievement().equals(cmClubinfos.getHighestAchievement())) {
+                    list.add("修改了活动业绩的最高业绩信息");
+                }
+
+                if (!cmClubinfo.getReachPepole().equals(cmClubinfos.getReachPepole())) {
+                    list.add("修改了活动业绩的到店人数信息");
+                }
+                if (!cmClubinfo.getClinchPepole().equals(cmClubinfos.getClinchPepole())) {
+                    list.add("修改了活动业绩的成交人数信息");
+                }
+            }
+
+
+            if (cmClubinfos.getConsumeA() == null || cmClubinfos.getConsumeB() == null || cmClubinfos.getConsumeC() == null) {
+                if (cmClubinfo.getConsumeA() != null || cmClubinfo.getConsumeB() != null || cmClubinfo.getConsumeC() != null) {
+                    list.add("新增了会员消费金额信息");
+                }
+            } else {
+                if (!cmClubinfo.getConsumeA().equals(cmClubinfos.getConsumeA())) {
+                    list.add("修改了A类会员消费金额");
+                }
+                if (!cmClubinfo.getConsumeB().equals(cmClubinfos.getConsumeB())) {
+                    list.add("修改了B类会员消费金额");
+                }
+                if (!cmClubinfo.getConsumeC().equals(cmClubinfos.getConsumeC())) {
+                    list.add("修改了C类会员消费金额");
+                }
+            }
+
+
+            if (cmClubinfos.getCateA() == null || cmClubinfos.getCateB() == null || cmClubinfos.getCateC() == null) {
+                if (null != cmClubinfo.getCateA() || null != cmClubinfo.getCateB() || null != cmClubinfo.getCateC()) {
+                    list.add("新增了会员信息");
+                }
+            } else {
+                if (!cmClubinfo.getCateA().equals(cmClubinfos.getCateA())) {
+                    list.add("修改了A会员信息");
+                }
+                if (!cmClubinfo.getCateB().equals(cmClubinfos.getCateB())) {
+                    list.add("修改了B会员信息");
+                }
+                if (!cmClubinfo.getCateC().equals(cmClubinfos.getCateC())) {
+                    list.add("修改了C会员信息");
+                }
+            }
+
+
+            if ("".equals(cmClubinfos.getMonthAchievement()) || "".equals(cmClubinfos.getPromotionAchievement()) || "".equals(cmClubinfos.getYearAchievement())) {
+                if (!"".equals(cmClubinfos.getMonthAchievement()) || !"".equals(cmClubinfos.getPromotionAchievement()) || !"".equals(cmClubinfos.getYearAchievement())) {
+                    list.add("新增了业绩信息");
+                }
+
+            } else {
+                if (!cmClubinfo.getMonthAchievement().equals(cmClubinfos.getMonthAchievement())) {
+                    list.add("修改了月业绩信息");
+                }
+
+                if (!cmClubinfo.getPromotionAchievement().equals(cmClubinfos.getPromotionAchievement())) {
+                    list.add("修改了促销业绩信息");
+                }
+                if (!cmClubinfo.getYearAchievement().equals(cmClubinfos.getYearAchievement())) {
+                    list.add("修改了年业绩信息");
+                }
+            }
+
+
+            if (cmClubinfos.getArea() == null || cmClubinfos.getBedNums() == null || cmClubinfos.getBeauticians() == null) {
+                if (null != cmClubinfo.getArea() || null != cmClubinfo.getBedNums() || null != cmClubinfo.getBeauticians()) {
+                    list.add("更新了基本信息");
+                }
+            } else {
+                if (!cmClubinfo.getArea().equals(cmClubinfos.getArea())) {
+                    list.add("修改了机构面积");
+                }
+                if (!cmClubinfo.getBedNums().equals(cmClubinfos.getBedNums())) {
+                    list.add("修改了美容床数");
+                }
+                if (!cmClubinfo.getBeauticians().equals(cmClubinfos.getBeauticians())) {
+                    list.add("修改了美容师数");
+                }
+            }
+
+
+            if (null == (newCmClubs.getInfo())) {
+                if (!"".equals(newCmClub.getInfo())) {
+                    list.add("新增了公司简介");
+                }
+            } else if (!newCmClub.getInfo().equals(newCmClubs.getInfo())) {
+                list.add("修改了公司简介");
+            }
+
+            if (cmClubinfo.getEmpnum() != null) {
+                if (!cmClubinfo.getEmpnum().equals(cmClubinfos.getEmpnum())) {
+                    list.add("更新了公司人数");
+                }
+            }
+            if (null == (newCmClubs.getFax())) {
+                if (!"".equals(newCmClub.getFax())) {
+                    list.add("新增了传真");
+                }
+            } else if (!newCmClub.getFax().equals(newCmClubs.getFax())) {
+                list.add("修改了传真");
+            }
+
+
+            if (null == (newCmClubs.getContractPhone())) {
+                if (!"".equals(newCmClub.getContractPhone())) {
+                    list.add("新增了固定电话");
+                }
+            } else if (!newCmClub.getContractPhone().equals(newCmClubs.getContractPhone())) {
+                list.add("修改了固定电话");
+            }
+
+            if (!newCmClub.getAddress().equals(newCmClubs.getAddress())) {
+                list.add("修改了详细地址");
+            }
+            if (newCmClub.getLinkManIdentity() != null) {
+                if (!newCmClub.getLinkManIdentity().equals(newCmClubs.getLinkManIdentity())) {
+                    list.add("修改了联系人身份");
+                }
+            }
+            if (newCmClubs.getLinkMan() == null) {
+                if (newCmClub.getUserName() != null) {
+                    list.add("新增了联系人");
+                }
+            }
+            if (!newCmClub.getUserName().equals(newCmClubs.getLinkMan())) {
+                list.add("修改了联系人");
+            }
+
+            if (newCmClubs.getMainpro() != null) {
+                if (!newCmClub.getMainpro().equals(newCmClubs.getMainpro())) {
+                    list.add("修改了主营内容");
+                }
+            }
+
+            if (newCmClubs.getFirstClubType() == null) {
+                if (newCmClub.getFirstClubType() != null) {
+                    list.add("新增了机构类型");
+                }
+            } else if (!newCmClub.getFirstClubType().equals(newCmClubs.getFirstClubType())) {
+                list.add("修改了机构类型");
+            }
+
+
+            if (newCmClubs.getBusinessLicenseImage() == null) {
+                if (newCmClub.getBusinessLicenseImage() != null) {
+                    list.add("新增了营业执照");
+                }
+            } else {
+                if (!newCmClub.getBusinessLicenseImage().equals(newCmClubs.getBusinessLicenseImage())) {
+                    list.add("修改了营业执照");
+                }
+            }
+
+
+            if (newCmClubs.getHeadpic() == null) {
+                if (newCmClub.getHeadpic() != null) {
+                    list.add("新增了门头照");
+                }
+                if (!newCmClub.getHeadpic().equals(newCmClubs.getHeadpic())) {
+                    list.add("修改了门头照");
+                }
+            }
+
+
+            if (newCmClubs.getSocialCreditCode() == null) {
+                if (newCmClub.getSocialCreditCode() != null) {
+                    list.add("新增了营业执照编号");
+                }
+            }
+            if (!newCmClub.getSocialCreditCode().equals(newCmClubs.getSocialCreditCode())) {
+                list.add("修改了营业执照编号");
+            }
+
+
+            if (newCmClubs.getAddress() == null) {
+                if (newCmClub.getAddress() != null) {
+                    list.add("新增了详细地址");
+                }
+            }
+
+
+            if (newCmClubs.getSname() == null) {
+                if (newCmClub.getSname() != null) {
+                    list.add("新增了机构简称");
+                }
+            }
+            if (!newCmClub.getSname().equals(newCmClubs.getSname())) {
+                list.add("修改了机构简称");
+            }
+
+            if (newCmClubs.getName() == null) {
+                if (newCmClub.getName() != null) {
+                    list.add("新增了机构名称");
+                }
+            }
+            if (!newCmClub.getName().equals(newCmClubs.getName())) {
+                list.add("修改了机构名称");
+            }
+
+            if ("".equals(newCmClubs.getContractMobile())) {
+                if (!newCmClub.getBindMobile().equals(null)) {
+                    list.add("新增了手机号");
+                }
+            }
+            if (!newCmClub.getBindMobile().equals(newCmClubs.getContractMobile())) {
+                list.add("修改了手机号");
+            }
+            if ("".equals(newCmClubs.getContractEmail())) {
+                if (!newCmClub.getContractEmail().equals(null)) {
+                    list.add("新增了注册邮箱");
+                }
+            }
+            if (!"".equals(newCmClub.getContractEmail())) {
+                if (!newCmClub.getContractEmail().equals(newCmClubs.getContractEmail())) {
+                    list.add("修改了邮箱");
+                }
+            }
+        }else {
+            list.add("新机构添加了信息");
+        }
+        sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
+
+        //获取操作时间
+        sysLog.setOperationtime(new Date());
+
+        //获取操作员
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+        sysLog.setContact(newCmClub.getLinkMan());
+        sysLog.setInstitutionName(newCmClub.getName());
+        sysLog.setOperationtype("编辑");
+        if (!"".equals(sysLog.getActioncontent())) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+                list.removeAll(list);
+            }
+        }
+
+
         String name = cmClubinfo.getName();
         String userName = cmClubinfo.getUserName();
         String bindMobile = cmClubinfo.getBindMobile();
@@ -419,8 +715,8 @@ public class AgencyController extends BaseController {
         user.setBindMobile(bindMobile);
         cmUserService.update(user);
         newCmClubService.update(newCmClub);//更新机构表数据
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+cmClubinfo);
         cmClubinfoService.save(cmClubinfo);
-
         addMessage(redirectAttributes, "保存机构资料成功");
         redirectAttributes.addAttribute("searchName", newCmClub.getSearchName());
         redirectAttributes.addAttribute("searchUserName", newCmClub.getSearchUserName());
@@ -441,8 +737,8 @@ public class AgencyController extends BaseController {
      */
     @RequiresPermissions("user:newCmClub:edit")
     @ResponseBody
-    @OperationLogAnnotation(operType = "更换协销")
     @RequestMapping(value = "changeSp")
+    @OperationLogAnnotation()
     public Map<String, Object> changeSp(String spID, String clubID, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
@@ -493,7 +789,6 @@ public class AgencyController extends BaseController {
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
             CmUser cmUser = cmUserService.get(id);
-            cmUs = cmUser;
             cmUser.setPassword(MD5Util.MD5(password));
             cmUserService.update(cmUser);
             map.put("success", true);
@@ -518,7 +813,7 @@ public class AgencyController extends BaseController {
      */
     @RequiresPermissions("user:newCmClub:edit")
     @ResponseBody
-    @OperationLogAnnotation(operType = "审核")
+//    @OperationLogAnnotation(operType = "审核")
     @RequestMapping(value = "auditClub")
     public Map<String, Object> auditClub(String auditStatus, String auditNote, String id, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
@@ -526,6 +821,9 @@ public class AgencyController extends BaseController {
         String smsMessage = "";
         String currTime = DateUtils.getDateTime();
         Integer userPermission;
+
+
+
         try {
             NewCmClub newCmClub = newCmClubService.get(id);
             Integer companyUserID = newCmClub.getUserID();
@@ -537,6 +835,32 @@ public class AgencyController extends BaseController {
             /**审核处理*/
             //审核通过
             if (StringUtils.equals("1", auditStatus)) {
+
+                OperationalLogs sysLog = new OperationalLogs();
+                if ("1".equals(auditStatus)){
+                    sysLog.setActioncontent("审核通过");
+                } else {
+                    sysLog.setActioncontent("审核不通过");
+                }
+                String Contact = sysLogService.auditlinkMan(Integer.parseInt(id));
+                String ionName = sysLogService.auditName(Integer.parseInt(id));
+                sysLog.setContact(Contact);
+                sysLog.setInstitutionName(ionName);
+                SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+                System.out.println("操作员" + principal.getName());
+                String username = principal.getName();
+                sysLog.setOperator(username);
+                sysLog.setOperationtype("审核");
+                sysLog.setOperationtime(new Date());
+                //调用service保存SysLog实体类到数据库
+                if (!"".equals(sysLog.getActioncontent())) {
+                    if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                        int i = sysLogService.insert(sysLog);
+                    }
+                }
+
+
+
                 userPermission = 2;
                 status = "90";
                 auditStatus = "1";
@@ -662,9 +986,32 @@ public class AgencyController extends BaseController {
      * @return
      */
     @ResponseBody
-    @OperationLogAnnotation(operType = "设置机构类别")
+//    @OperationLogAnnotation(operType = "设置机构类别")
     @RequestMapping("/upgradeClub")
     public Map<String, Object> upgradeClub(NewCmClub cmClub, String type, RedirectAttributes redirectAttributes) {
+        OperationalLogs sysLog = new OperationalLogs();
+        sysLog.setOperationtime(new Date());
+        if ("1".equals(type)){
+            sysLog.setActioncontent("设置为资质机构");
+        }else {
+            sysLog.setActioncontent("设置为个人机构");
+        }
+        sysLog.setContact(cmClub.getLinkMan());
+        sysLog.setInstitutionName(cmClub.getName());
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+        sysLog.setOperationtype("设置机构类别");
+        //调用service保存SysLog实体类到数据库
+        if (!"".equals(sysLog.getActioncontent())) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+            }
+        }
+
+
+
         Map<String, Object> map = new HashMap<>();
         if (cmClub != null) {
             CmUser cmUser = cmUserService.get(cmClub.getUserID().toString());

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

@@ -10,11 +10,9 @@ import com.caimei.modules.project.dao.ServiceProviderDao;
 import com.caimei.modules.project.model.ClubModel;
 import com.caimei.modules.project.model.ServiceProviderModel;
 import com.caimei.modules.sys.utils.ValidateUtils;
+import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.entity.*;
-import com.caimei.modules.user.service.ClubChangeSpReviewService;
-import com.caimei.modules.user.service.CmBindService;
-import com.caimei.modules.user.service.CmSpService;
-import com.caimei.modules.user.service.CmUserService;
+import com.caimei.modules.user.service.*;
 import com.caimei.utils.AppKeys;
 import com.caimei.utils.DateUtils;
 import com.caimei.utils.MD5Utils;
@@ -23,6 +21,8 @@ import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,8 @@ public class SpController extends BaseController {
     private ClubDao clubDao;
     @Autowired
     private CmBindService cmBindService;
-
+    @Autowired
+    private SysLogService sysLogService;
 
     @ModelAttribute
     public NewCmSp get(@RequestParam(required = false) String id) {
@@ -102,6 +103,8 @@ public class SpController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "saveReview")
     public Map<String, Object> saveReview(String reviewStatus, Integer clubChangeSpRecordID, Integer newSpID) {
+        OperationalLogs sysLog = new OperationalLogs();
+
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
             Date currentTime = new Date();
@@ -113,6 +116,7 @@ public class SpController extends BaseController {
             if (StringUtils.equals("pass", reviewStatus)) {
                 ClubChangeSp cssp = clubChangeSpReviewService.getClubChangeSpById(clubChangeSpRecordID);
                 if (null != cssp) {
+                    String clubIDs = sysLogService.ClubsName(clubChangeSpRecordID);
                     // 查询serviceprovider协销表
                     List<ServiceProviderModel> serviceprovider = serviceProviderDao.getServiceproviderById(cssp.getNewSpID());
                     // 查询cm_bind表
@@ -141,6 +145,26 @@ public class SpController extends BaseController {
                         clubChangeSpReviewService.updateCheckStatusById(clubChangeSp);
                         map.put("success", true);
                         map.put("msg", "操作成功");
+                        String clubID = sysLogService.ClubsName(clubChangeSpRecordID);
+                        String jgName = sysLogService.JgName(clubChangeSpRecordID);
+                        String linkMans = sysLogService.ClubName(clubChangeSpRecordID);
+                        sysLog.setOperationtime(new Date());
+                        if (!"".equals(linkMans)) {
+                            sysLog.setActioncontent(clubIDs + "更换为" + clubID);
+                        }
+                        sysLog.setOperationtype("更换协销");
+                        sysLog.setContact(linkMans);
+                        sysLog.setInstitutionName(jgName);
+                        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+                        System.out.println("操作员" + principal.getName());
+                        String username = principal.getName();
+                        sysLog.setOperator(username);
+                        //调用service保存SysLog实体类到数据库
+                        if (!"".equals(sysLog.getActioncontent())) {
+                            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                                int i = sysLogService.insert(sysLog);
+                            }
+                        }
 
                     } else {
                         map.put("success", false);

src/main/resources/mappings/modules/newhome/AnnouncementMapper.xml

@@ -9,7 +9,7 @@
 
         <where>
             <if test="title != null and title != ''">
-                AND title = #{title}
+                AND title = #{title}+'%'
             </if>
             <if test="state != null and state != 0">
                 AND `state` = #{state}
@@ -77,4 +77,4 @@
     DELETE FROM announcement_management WHERE id=#{id}
 </delete>
 
-</mapper>
+</mapper>

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

@@ -561,6 +561,7 @@
 			cso.orderID AS orderID,
 			co.payTotalFee AS orderAmount,
 			co.payableAmount AS payableAmount,
+		    co.onlinePayFlag,
 			(select
 			 sum(o.needPayAmount)
 			 from  cm_receipt_order_relation cror
@@ -593,6 +594,7 @@
 			co.orderID AS orderID,
 			co.payTotalFee AS orderAmount,
 			co.payableAmount AS payableAmount,
+            co.onlinePayFlag,
 			(select
 			 sum(cror.associateAmount)
 			 from cm_receipt_order_relation cror
@@ -972,4 +974,15 @@
                  LEFT JOIN cm_coupon cc ON ccb.couponId=cc.id
         WHERE receiptID = #{receiptID}
     </select>
+    <select id="getShopOrderInfos" resultType="com.caimei.modules.order.entity.NewShopOrder">
+        select cso.shopOrderNo,shopOrderID,cso.realPay,cso.receiptAmount,cso.receiptStatus as shopReceiptStatus from cm_order co left join cm_shop_order cso on co.orderID = cso.orderID
+        <where>
+            <if test="shopOrderId != null and shopOrderId != ''">
+                and cso.shopOrderID = #{shopOrderId}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                and co.orderId = #{orderId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -58,6 +58,7 @@
 		a.organizeStoreId as organizeStoreId,
 		a.couponAmount as couponAmount,
         a.svipFullReduction as svipFullReduction,
+        (a.discountFee + a.promotionFullReduction + a.couponAmount) as discountAmount,
         if(chcm.id is not null,1,0) as collageFlag,
         chc.status as collageStatus
     </sql>

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

@@ -1135,13 +1135,7 @@
     <select id="getProductOrder" resultType="java.lang.String">
         SELECT productID
         FROM `cm_order_product`
-        WHERE orderId = #{orderid}
-    </select>
-
-    <select id="promotionFull" resultType="java.lang.Double">
-        SELECT promotionFullReduction
-        FROM `cm_order`
-        WHERE orderId = #{orderid}
+        WHERE orderID = #{orderid}
     </select>
 
 </mapper>

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

@@ -112,7 +112,8 @@
 			reachPepole,
 			clinchPepole,
 			createTime,
-			updateTime
+			updateTime,
+			empnum
 		) VALUES (
 		    #{clubID},
 			#{userID},
@@ -134,7 +135,8 @@
 			#{reachPepole},
 			#{clinchPepole},
 			#{createTime},
-			#{updateTime}
+			#{updateTime},
+		    #{empnum}
 		)
 	</insert>
 
@@ -198,8 +200,11 @@
 			<if test="updateTime != null and updateTime != ''">
 				updateTime = #{updateTime},
 			</if>
+		<if test="empnum != null and empnum != ''">
+			empnum = #{empnum},
+		</if>
 			userID = #{userID}
-			WHERE clubInfoID = #{id}
+			WHERE clubID = #{id}
 	</update>
 
 	<delete id="delete">

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

@@ -9,16 +9,22 @@
 
         <where>
             <if test="institutionName != null and institutionName != ''">
-                AND institutionName = #{institutionName}
+                AND institutionName = '%'+#{institutionName}+'%'
             </if>
             <if test="Contact != null and Contact != ''">
-                AND Contact = #{Contact}
+                AND Contact = '%'+#{Contact}+'%'
             </if>
             <if test="operationtype != null and operationtype != ''">
-                AND operationtype = #{operationtype}
+                AND operationtype = '%'+#{operationtype}+'%'
             </if>
             <if test="Operationtime != null and Operationtime != ''">
-                AND Operationtime = #{Operationtime}
+                AND Operationtime = '%'+#{Operationtime}+'%'
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND Operationtime <![CDATA[ > ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND Operationtime <![CDATA[ < ]]> #{endTime}
             </if>
         </where>
         order by Operationtime desc
@@ -46,5 +52,9 @@
                 #{Operator},
                 #{Operationtime})
     </insert>
-
-</mapper>
+    <select id="shoplist" resultType="NewCmShop">
+        SELECT *  FROM `shop` s
+         LEFT JOIN `user` u ON u.userID = s.userID
+        WHERE s.shopID = #{shopID}
+    </select>
+</mapper>

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

@@ -9,16 +9,22 @@
 
         <where>
             <if test="institutionName != null and institutionName != ''">
-                AND institutionName = #{institutionName}
+                AND institutionName = '%'+#{institutionName}+'%'
             </if>
             <if test="Contact != null and Contact != ''">
-                AND Contact = #{Contact}
+                AND Contact = '%'+#{Contact}+'%'
             </if>
             <if test="operationtype != null and operationtype != ''">
-                AND operationtype = #{operationtype}
+                AND operationtype = '%'+#{operationtype}+'%'
             </if>
             <if test="Operationtime != null and Operationtime != ''">
-                AND Operationtime = #{Operationtime}
+                AND Operationtime = '%'+#{Operationtime}+'%'
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND Operationtime <![CDATA[ > ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND Operationtime <![CDATA[ < ]]> #{endTime}
             </if>
         </where>
         order by Operationtime desc
@@ -47,4 +53,58 @@
                 #{Operationtime})
     </insert>
 
-</mapper>
+    <select id="ClubName" resultType="java.lang.String">
+        SELECT a.linkMan FROM `club` a
+        LEFT JOIN clubchangesprecord b ON a.clubid = b.clubid
+        WHERE b.clubChangeSpRecordID = #{clubChangeSpRecordID}
+    </select>
+    <select id="ClubsName" resultType="java.lang.String">
+        SELECT a.inviterName FROM `club` a
+        LEFT JOIN clubchangesprecord b ON a.clubid = b.clubid
+        WHERE b.clubChangeSpRecordID =#{clubChangeSpRecordID}
+    </select>
+
+    <select id="JgName" resultType="java.lang.String">
+        SELECT `name` FROM `club` a
+        LEFT JOIN clubchangesprecord b ON a.clubid = b.clubid
+        WHERE b.clubChangeSpRecordID = #{clubChangeSpRecordID}
+    </select>
+    <select id="linkMan" resultType="java.lang.String">
+        SELECT `linkMan` FROM `club` a
+        LEFT JOIN clubchangesprecord b ON a.clubid = b.clubid
+        WHERE b.clubChangeSpRecordID = #{clubChangeSpRecordID}
+    </select>
+
+    <select id="passName" resultType="java.lang.String">
+        SELECT `name`  FROM club a
+        WHERE a.userID =#{userID}
+    </select>
+
+    <select id="PasslinkMan" resultType="java.lang.String">
+        SELECT `linkMan`  FROM club a
+        WHERE a.userID =#{userID}
+    </select>
+
+    <select id="auditName" resultType="java.lang.String">
+        SELECT name  FROM club a
+        WHERE a.clubID =#{clubID}
+    </select>
+
+    <select id="auditlinkMan" resultType="java.lang.String">
+        SELECT linkMan  FROM club a
+        WHERE a.clubID =#{clubID}
+    </select>
+
+    <select id="newCmClub" resultType="NewCmClub">
+        SELECT * FROM club WHERE clubID= #{clubID}
+    </select>
+    <select id="cmclubinfo" resultType="CmClubinfo">
+        SELECT * FROM clubinfo
+        WHERE clubInfoID = #{id}
+    </select>
+
+    <select id="temPorary" resultType="ClubTemporary">
+        SELECT * FROM club_temporary
+        WHERE id = #{id}
+    </select>
+</mapper>

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

@@ -8,7 +8,7 @@
         .res{
             color: red;
             /*margin-right: 30px;*/
-            margin-left: 196px;
+            margin-left: 197px;
         }
         .form-horizontal .controls {
             margin-left: 0;
@@ -99,47 +99,49 @@
         .control-label{
             margin-left: 130px;
         }
-
     </style>
 
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/order/detail?id=${orderId}">订单详细</a></li>
-    <li><a href="${ctx}/bulkpurchase/commissions/list">销售提成记录</a></li>
-    <li class="active"><a href="${ctx}/bulkpurchase/commissions/form">添加销售提成记录</a></li>
+    <li><a href="${ctx}/order/detail?id=${OrderId}">订单详情</a></li>
+    <li><a href="${ctx}/bulkpurchase/commissions?orderId=${OrderId}">销售提成记录</a></li>
+    <li class="active"><a href="${ctx}/bulkpurchase/commissions/form?orderId=${OrderId}">添加销售提成记录</a></li>
 </ul>
 <br/>
-<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;">
-        <div style="width: 700px;margin-right: 500px">
-        <tr>
+
+
+
+<form:form id="inputForm" modelAttribute="commissions" onsubmit="return cm()" action="${ctx}/bulkpurchase/commissions/save?orderId=${OrderId}" method="post" class="form-horizontal">
+    <sys:message content="${message}"/>
+<table  align = "center" border="0" cellspacing="0" cellpadding="10" width="100%">
+        <tr colspan="0">
             <td>
                 <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>
+                <input type="radio" id="sales"  name="sales" value="已计算销售提成">已计算销售提成&nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;
+                <input type="radio" id="sales" value="已退销售提成" name="sales">已退销售提成 &nbsp; <span id="bx">*必填</span>
             </td>
         </tr>
-    </div>
         <br/>
-        <tr>
+        <tr colspan="1">
             <td>
-                <div class="control-group" style="height: 30px ">
-                    <label height="30px" class="control-label"><strong>备注内容：</strong></label>
+                <div class="control-group">
+                    <label 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>
-    </div>
-    <td colspan="5" style="text-align:center;">
-
+    <br/>
+    <tr  colspan="2">
+        <td>
+            <label class="control-label"></label>
         <input id="btnSave" class="btn btn-primary" type="submit"  value="保 存"/>
         <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 
-    </td>
-
+        </td>
+    </tr>
+    </table>
 </form:form>
 
 <script>

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

@@ -286,12 +286,8 @@
                 <c:if test="${order.receiptStatus eq 1}">无支付无退款</c:if>
                 <c:if test="${order.receiptStatus ne 1}">
                     <c:if test="${returnOnline}">
-                        <input class="check-item-review refundOnlineFee" type="radio"   name="returnedWay" value='2'/>
+                        <input class="check-item-review refundOnlineFee" type="radio" checked name="returnedWay" value='2'/>
                         线上退回
-                        <c:if test="${empty order.rechargeGoods}">
-                            <input class="check-item-review refundBalanceFee" type="radio"  name="returnedWay" value='1'/>
-                            账户余额
-                        </c:if>
                     </c:if>
                     <c:if test="${!returnOnline}">
                         <input class="check-item-review refundOfflineFee" type="checkbox"   name="returnedWay" value='3' onclick="showBankInfo()"/>
@@ -492,7 +488,7 @@
                             子订单金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount}" pattern="0.00" maxFractionDigits="2" />
                         </td>
                         <td>
-                            收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                            收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}
                         </td>
                         <td>
                             发货状态：${fns:getDictLabel(shopOrder.sendOutStatus,'sendOutStatus' ,'' )}
@@ -507,40 +503,25 @@
                             </c:if>
                         </td>
                     </tr>
-                    <tr>
-                        <td style="width: 300px;">
-                           商品总额：${shopOrder.totalAmount}
-                        </td>
-                        <td  style="width: 275px;">
-                            优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <td>
-                           余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                    <c:if test="${order.onlinePayFlag eq 0}">
+                        <tr>
                             <td>
-                                应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrder.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                            <td colspan="2">
+                                优惠：￥<fmt:formatNumber type="number" value="${shopOrder.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
                             </td>
-                        </c:if>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
                             <td>
-                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.realPay}" pattern="0.00" maxFractionDigits="2" />
                             </td>
-                        </c:if>
-                        <td>
-                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
                             <td>
-                                待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                                已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
                             </td>
-                        </c:if>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
                             <td>
-                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.restAmount}" pattern="0.00" maxFractionDigits="2" />
                             </td>
-                        </c:if>
-                    </tr>
+                        </tr>
+                    </c:if>
                         <c:forEach items="${shopOrder.newOrderProducts}" var="newOrderProduct" varStatus="productStatus">
                     <tr>
                             <td colspan="5">
@@ -581,14 +562,14 @@
                                         <input type="hidden" id="returning${status.index}${productStatus.index}" value="${newOrderProduct.returningPurchaseProductNum}"/>
                                         <%--已退货=所有退货数量总和--%>
                                         <td><font color="red"><span>已退货：<span id="returned${status.index}${productStatus.index}">${newOrderProduct.returnedPurchaseProductNum}</span></span></font></td>
-                                        <td colspan="4"><font color="red"><span>本次退货：<input ${newOrderProduct.presentNum>0?"readonly":""} presentNum="${newOrderProduct.presentNum}" id="applicationReturnedNum${status.index}${productStatus.index}" class="refundGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationReturnedNum" value="${newOrderProduct.num + newOrderProduct.presentNum - newOrderProduct.notOutStore -newOrderProduct.returnedPurchaseProductNum }" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input tuihuo" type="text" onchange="setApplicationReturnedNum(${status.index},${productStatus.index})"></span></font></td>
+                                        <td colspan="4"><font color="red"><span>本次退货：<input ${newOrderProduct.presentNum>0 or shopOrder.shopID eq 998?"readonly":""} presentNum="${newOrderProduct.presentNum}" id="applicationReturnedNum${status.index}${productStatus.index}" class="refundGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationReturnedNum" value="${shopOrder.shopID eq 998?0:(newOrderProduct.num + newOrderProduct.presentNum - newOrderProduct.notOutStore -newOrderProduct.returnedPurchaseProductNum) }" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input tuihuo" type="text" onchange="setApplicationReturnedNum(${status.index},${productStatus.index})"></span></font></td>
                                     </tr>
                                     <tr>
                                         <%--待发货=未出库数量-取消数量--%>
                                         <td><font color="red">待发货：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}</span></font></td>
                                         <%--已取消数量=所有已取消数量总和--%>
                                         <td><font color="red">已取消：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.cancelProductNum}</span></font></td>
-                                        <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
+                                        <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0 or shopOrder.shopID eq 998?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${shopOrder.shopID eq 998?0:(newOrderProduct.notOutStore - newOrderProduct.cancelProductNum)}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].shopOrderID" value="${newOrderProduct.shopOrderID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].productID" value="${newOrderProduct.productID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].orderProductID" value="${newOrderProduct.orderProductID}"/>
@@ -660,12 +641,12 @@
                                         <td><font color="red">已发货：<span id="shipped${status.index}${productStatus.index}">${newOrderProduct.num + newOrderProduct.presentNum - newOrderProduct.notOutStore}</span></font></td>
                                         <input type="hidden" id="returning${status.index}${productStatus.index}" value="${newOrderProduct.returningPurchaseProductNum}"/>
                                         <td><font color="red"><span>已退货：<span id="returned${status.index}${productStatus.index}">${newOrderProduct.returnedPurchaseProductNum}</span></span></font></td>
-                                        <td colspan="4"><font color="red"><span>本次退货：<input ${newOrderProduct.presentNum>0?"readonly":""} presentNum="${newOrderProduct.presentNum}" id="applicationReturnedNum${status.index}${productStatus.index}" class="refundGoodsInput1 shopOrderInput1 refundGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationReturnedNum" value="${newOrderProduct.num + newOrderProduct.presentNum - newOrderProduct.notOutStore - newOrderProduct.returnedPurchaseProductNum}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input tuihuo" type="text" onchange="setApplicationReturnedNum(${status.index},${productStatus.index})"></span></font></td>
+                                        <td colspan="4"><font color="red"><span>本次退货：<input ${newOrderProduct.presentNum>0 or shopOrder.shopID eq 998?"readonly":""} presentNum="${newOrderProduct.presentNum}" id="applicationReturnedNum${status.index}${productStatus.index}" class="refundGoodsInput1 shopOrderInput1 refundGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationReturnedNum" value="${shopOrder.shopID eq 998?0:(newOrderProduct.num + newOrderProduct.presentNum - newOrderProduct.notOutStore - newOrderProduct.returnedPurchaseProductNum)}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input tuihuo" type="text" onchange="setApplicationReturnedNum(${status.index},${productStatus.index})"></span></font></td>
                                     </tr>
                                     <tr>
                                         <td><font color="red">待发货：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}</span></font></td>
                                         <td><font color="red">已取消：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.cancelProductNum}</span></font></td>
-                                        <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
+                                        <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0 or shopOrder.shopID eq 998?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${shopOrder.shopID eq 998?0:(newOrderProduct.notOutStore - newOrderProduct.cancelProductNum)}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].shopOrderID" value="${newOrderProduct.shopOrderID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].productID" value="${newOrderProduct.productID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].orderProductID" value="${newOrderProduct.orderProductID}"/>
@@ -707,6 +688,11 @@
             $(".shopOrderInput").attr("readonly",true);
         }
 
+        // 有优惠不可修改，只能全退
+        if (${order.discountAmount > 0}){
+            $(".shopOrderInput").attr("readonly",true);
+        }
+
         if(orderStatus == "true"){
             $("#returnWayDiv").html("");
             $("#returnWayDiv").html("未支付无退款");
@@ -876,7 +862,6 @@
             })
             return originalAmount;
         }
-
     });
 
     (function(){
@@ -935,6 +920,10 @@
             alertx("退货数量不能大于已发货数量（之前已退不算）！");
             $("#applicationReturnedNum"+a+b).val(0)
         }
+        if (num !== max){
+            alertx("退货数量只能等于已发货数量（之前已退不算）！");
+            $("#applicationReturnedNum"+a+b).val(0)
+        }
 
     };
     function setApplicationCancelNum(a,b){
@@ -944,7 +933,10 @@
             alertx("取消数量不能大于待发数量，请重新填写！");
             $("#applicationCancelNum"+a+b).val(0)
         }
-
+        if (num !== max){
+            alertx("取消数量只能等于待发数量，请重新填写！");
+            $("#applicationCancelNum"+a+b).val(0)
+        }
     };
 </script>
 </body>

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

@@ -8,8 +8,8 @@
 <body>
 <ul class="nav nav-tabs">
 	<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>
+	<li class="active"><a href="${ctx}/bulkpurchase/commissions?orderId=${orderId}">销售提成记录</a></li>
+	<li><a href="${ctx}/bulkpurchase/commissions/form?orderId=${orderId}">添加销售提成记录</a></li>
 </ul>
 <br/>
 <form:form id="inputForm" modelAttribute="commissions" action="${ctx}/bulkpurchase/commissions/save" method="post" class="form-horizontal">

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

@@ -362,7 +362,6 @@
     <input type="hidden" id="shopOrderSize" value='${fns:listToJson(cmReturnedPurchase.shopOrderReturnedList)}'>
     <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned"
                varStatus="shopOrderReturnedStatus">
-        <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status">
         <tr>
             <td colspan="7">
                 <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}"
@@ -373,7 +372,7 @@
                         </td>
                         <td style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
                         <td>
-                            收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                            收款状态：${fns:getDictLabel(shopOrderReturned.receiptStatus,'receiptStatus' ,'' )}
                         </td>
                         <td>发货状态：
                                 ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
@@ -388,41 +387,25 @@
                             </c:if>
                         </td>
                     </tr>
-            <tr>
-                <td style="width: 300px;">
-                    商品总额：${shopOrder.totalAmount}
-                </td>
-                <td  style="width: 275px;">
-                    优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
-                </td>
-                <td>
-                    余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                </td>
-                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
-                    <td>
-                        应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
-                    </td>
-                </c:if>
-                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
-                    <td>
-                        应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                    </td>
-                </c:if>
-                <td>
-                    已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                </td>
-                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
-                    <td>
-                        待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
-                    </td>
-                </c:if>
-                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
-                    <td>
-                        待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                    </td>
-                </c:if>
-            </tr>
-                    </c:forEach>
+                    <c:if test="${order.onlinePayFlag ne 1}">
+                        <tr>
+                            <td>
+                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                            <td>
+                                优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturned.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.realPay}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                            <td>
+                                已付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.restAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </tr>
+                    </c:if>
                     <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}"
                                var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                         <tr>

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

@@ -504,8 +504,6 @@
 
         <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">
                 <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned" varStatus="shopOrderReturnedStatus">
-                    <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status" begin="1" end="18">
-
                     <tr>
                         <td colspan="7">
                             <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
@@ -513,7 +511,7 @@
                                     <td style="width: 300px;">子订单编号(ID)：${shopOrderReturned.shopOrderNo}(${shopOrderReturned.shopOrderID})</td>
                                     <td  style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
                                     <td>
-                                        收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                                        收款状态：${fns:getDictLabel(shopOrderReturned.shopReceiptStatus,'receiptStatus' ,'' )}
                                     </td>
                                     <td>发货状态：
                                             ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
@@ -523,41 +521,25 @@
                                     </td>
                                     <td>供应商：${shopOrderReturned.shopName}</td>
                                 </tr>
-                                <tr>
-                                    <td style="width: 300px;">
-                                        商品总额：${shopOrder.totalAmount}
-                                    </td>
-                                    <td  style="width: 275px;">
-                                        优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
-                                    </td>
-                                    <td>
-                                        余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                                    </td>
-                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                                <c:if test="${order.onlinePayFlag eq 0}">
+                                    <tr>
                                         <td>
-                                            应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                                            商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
                                         </td>
-                                    </c:if>
-                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
                                         <td>
-                                            应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                                            优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturned.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
                                         </td>
-                                    </c:if>
-                                    <td>
-                                        已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                                    </td>
-                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
-                                    <td>
-                                        待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
-                                    </td>
-                                    </c:if>
-                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
                                         <td>
-                                            待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                                            应付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.realPay}" pattern="0.00" maxFractionDigits="2" />
                                         </td>
-                                    </c:if>
-                                </tr>
-                    </c:forEach>
+                                        <td>
+                                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                        <td>
+                                            待付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.restAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                    </tr>
+                                </c:if>
                                 <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                                     <tr>
                                         <td  rowspan="4" style="width: 295px;height: 125px">

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

@@ -441,7 +441,6 @@
 <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
             <input type="hidden" id="shopOrderSize" value='${fns:listToJson(cmReturnedPurchase.shopOrderReturnedList)}'>
             <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned" varStatus="shopOrderReturnedStatus">
-                <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status">
                 <tr>
                     <td colspan="7">
                     <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
@@ -449,7 +448,7 @@
                             <td style="width: 300px;">子订单编号(ID)：${shopOrderReturned.shopOrderNo}(${shopOrderReturned.shopOrderID})</td>
                             <td  style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
                             <td>
-                                收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                                收款状态：${fns:getDictLabel(shopOrderReturned.shopReceiptStatus,'receiptStatus' ,'' )}
                             </td>
                             <td>发货状态：
                                     ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
@@ -464,41 +463,25 @@
                                 </c:if>
                             </td>
                         </tr>
-                    <tr>
-                        <td style="width: 300px;">
-                            商品总额：${shopOrder.totalAmount}
-                        </td>
-                        <td  style="width: 275px;">
-                            优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <td>
-                            余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
-                            <td>
-                                应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
-                            </td>
-                        </c:if>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
-                            <td>
-                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
-                            </td>
-                        </c:if>
-                        <td>
-                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                        </td>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
-                            <td>
-                                待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
-                            </td>
-                        </c:if>
-                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
-                            <td>
-                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
-                            </td>
+                        <c:if test="${order.onlinePayFlag ne 1}">
+                            <tr>
+                                <td>
+                                    商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
+                                </td>
+                                <td>
+                                    优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturned.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
+                                </td>
+                                <td>
+                                    应付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.realPay}" pattern="0.00" maxFractionDigits="2" />
+                                </td>
+                                <td>
+                                    已付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
+                                </td>
+                                <td>
+                                    待付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturned.restAmount}" pattern="0.00" maxFractionDigits="2" />
+                                </td>
+                            </tr>
                         </c:if>
-                    </tr>
-                </c:forEach>
                         <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                             <tr>
                                 <td  rowspan="4" style="width: 295px;height: 125px">

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

@@ -145,6 +145,14 @@
             outline: none;
             border: none;
         }
+        label
+        {
+            display: inline-block;
+            width: 60px;
+            text-align: justify;
+            text-align-last: justify;
+            margin-right: 270px;
+        }
     </style>
 </head>
 <body>
@@ -152,55 +160,54 @@
     <li><a href="${ctx}/newhome/Announcement/">公告管理</a></li>
     <li class="active"><a href="${ctx}/newhome/Announcement/forms">添加</a></li>
 </ul>
-<form id="inputForm" modelAttribute="announcementmanagement" onsubmit="return um()" action="${ctx}/newhome/Announcement/save" method="post" class="form-horizontal">
+<form:form id="inputForm" modelAttribute="announcementmanagement" onsubmit="return um()" action="${ctx}/newhome/Announcement/save?id=${Announcementmanagement.id}" method="post" class="form-horizontal">
     <sys:message content="${message}"/>
-    <table border="0" cellspacing="0" cellpadding="0" width="100%">
+    <table  align = "center" border="0" cellspacing="0" cellpadding="20" width="100%">
         <tr>
-            <th style="margin-right: 350px" height="10px"><span style="color: red">*</span>  标题：</th>
+            <th><span style="color: red">*</span>  标题：</th>
             <td colspan="3">
-                <input name="title" id="title" maxlength="30" value="${Announcementmanagement.title}"
+                <form:input path="title" name="title" id="title" maxlength="30" value="${Announcementmanagement.title}"
                        onchange="checkmaxlength(this.value)"
                        style="width: 360px;" placeholder="请输入公告标题，30字以内。" class="short input-small required"/><span id="bx3"  class="red">*必填</span>
             </td>
 
-
         </tr>
 
         <tr>
             <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 class="detailInfoEditor" style="width: 610px;">
+                    <textarea name="capacity" id="capacity">${Announcementmanagement.capacity}</textarea><span id="bx4"  class="red">*必填</span>
                 </div>
-
             </td>
-
         </tr>
+<tr>
+            <th></th>
+            <td colspan="3" >
+                <c:if test="${not empty Announcementmanagement.id}">
 
+                    <c:if test="${Announcementmanagement.state==1}">
+                        <strong>状态: </strong>已上线<br>
+                        <strong>上线时间: </strong><fmt:formatDate value="${Announcementmanagement.livetime}" type="both" pattern="yyyy-MM-dd HH:mm:ss"/>
+                    </c:if>
+                    <c:if test="${Announcementmanagement.state==2}">
+                        <STRONG>状态:</STRONG>已下线<br>
+                        <STRONG>上线时间:</STRONG><fmt:formatDate value="${Announcementmanagement.offlinetime}" type="both" pattern="yyyy-MM-dd HH:mm:ss"/>
+                    </c:if>
+                </c:if>
+            </td>
+</tr>
         <tr>
             <td colspan="5" style="text-align:center;">
                 <shiro:hasPermission name="product:product:edit">
-                    <input id="btnSave" class="btn btn-primary" type="submit" value="保 存"/>
+                    <input id="btnSave" class="btn btn-primary" onsubmit="return um()" type="submit" value="保 存"/>
                 </shiro:hasPermission>
                 <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
             </td>
         </tr>
-        <c:if test="${not empty Announcementmanagement.id}">
-            <tr id="zt">
-                <td colspan="4" style="vertical-align: top;">
-                    <c:if test="${Announcementmanagement.state==1}">
-                        状态：已上线<br>
-                        上线时间:<fmt:formatDate value="${Announcementmanagement.livetime}" type="both" pattern="yyyy-MM-dd HH:mm:ss"/>
-                    </c:if>
-                    <c:if test="${Announcementmanagement.state==2}">
-                        状态：已下线<br>
-                        下线时间:<fmt:formatDate value="${Announcementmanagement.offlinetime}" type="both" pattern="yyyy-MM-dd HH:mm:ss"/>
-                    </c:if>
-                </td>
-            </tr>
-        </c:if>
+
     </table>
-</form>
+</form:form>
 
 <!-- 富文本编辑器 -->
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
@@ -208,37 +215,17 @@
 <script type="text/javascript">
 
 
-//判断非空
-    function um(){
-        // debugger
-        var capacity=document.getElementById("capacity").value;
-        var title=document.getElementById("title").value.length;
-        var bx3=document.getElementById("bx3");
-        var bx5=document.getElementById("bx5");
-        console.log('2222222222222',title);
-        if(title==0){
-            console.log('111111111',title);
-            bx3.style.display="inline-block";
-            bx5.style.display="inline";
-        return false;
-       }
 
-    if(capacity.equals("")){
-            bx3.style.display="inline-block";
-            bx5.style.display="inline-block";
-            return false;
-        }
-    }
-
-    function changeTR(selectedValue) {
-        var tr1 = document.getElementById("zt");
 
-        if (selectedValue == 0) {
-            tr1.style.display = 'block';
-        } else {
-            tr1.style.display = 'none';
-        }
-    }
+    // function changeTR(selectedValue) {
+    //     var tr1 = document.getElementById("zt");
+    //
+    //     if (selectedValue == 0) {
+    //         tr1.style.display = 'block';
+    //     } else {
+    //         tr1.style.display = 'none';
+    //     }
+    // }
 
     //富文本框
     ClassicEditor.create(document.querySelector('#capacity'), {
@@ -250,6 +237,24 @@
     }).catch(function (error) {
         console.log(error);
     });
+
+
+    //判断非空
+    function um(){  console.log('111111111',capacity);
+        // debugger
+        var capacity=document.getElementById("capacity").value.length;
+        var title=document.getElementById("title").value.length;
+        var bx3=document.getElementById("bx3");
+        var bx4=document.getElementById("bx4");
+        console.log('2222222222222',title);
+        if(title<=0 || capacity<=0){
+            bx4.style.display="inline-block";
+            bx3.style.display="inline-block";
+            return false;
+        }
+
+
+    }
 </script>
 
 </body>

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

@@ -33,13 +33,13 @@
     <li class="active"><a href="${ctx}/newhome/Announcement/">公告管理</a></li>
     <li><a href="${ctx}/newhome/Announcement/forms">添加</a></li>
 </ul>
-<form id="searchForm" modelAttribute="announcementmanagement" action="${ctx}/newhome/Announcement" method="post"
+<form:form id="searchForm" modelAttribute="announcementmanagement" action="${ctx}/newhome/Announcement" 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>
-        <input name="title" maxlength="50" class="input-medium"/>
+        <form:input path="title" name="title" maxlength="50" class="input-medium"/>
         <label>状态：</label>
         <select name="state" class="input-medium">
             <option selected value="0">全部</option>
@@ -49,7 +49,7 @@
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
     </div>
     &nbsp;
-</form>
+</form:form>
 <sys:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>

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

@@ -257,10 +257,13 @@
                                 value="${orderInfo.orderAmount}"
                                 pattern="#0.00"/></span>
                         <span>
+                        <span><label>应收金额：</label>¥<fmt:formatNumber value="${orderInfo.payableAmount}"
+                                                                         pattern="#0.00"/></span>
+                        <span>
                         <label>已收金额：</label>¥<fmt:formatNumber
                                 value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
                                 pattern="#0.00"/>
-                        <span>
+                            <span>
                                     <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord"
                                                varStatus="index">
                                         <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
@@ -325,6 +328,18 @@
                                         <c:if test="${orderInfo.orderType == 1}">自主订单</c:if></span>
                         <span><label>下单日期：</label>${orderInfo.orderTime}</span>
                     </div>
+                    <div class="shop-order-row">
+                        <c:forEach items="${orderInfo.shopOrderInfos}" var="shopOrder" varStatus="index">
+                            <span>子订单编号：${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
+                            <span>子订单金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
+                                                           pattern="#0.00"/></span>
+                            <span>子订单应收金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
+                                                           pattern="#0.00"/></span>
+                            <span>子订单已收金额：¥<fmt:formatNumber value="${shopOrder.receiptAmount}"
+                                                           pattern="#0.00"/></span>
+                            <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
+                        </c:forEach>
+                    </div>
                     <div class="receipt-order-row4">
                         <div><h5><label>订单收款记录：</label></h5></div>
                         <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">

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

@@ -670,15 +670,16 @@
                 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(',',''));
+            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(',','')),
+            eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
             totalComissionEle.each(function () {
                 totalComissionVal += Number($(this).text().replace(',', ''));
             })
-            resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
+            resVal = (totalComissionVal + clubFreight - thirdPartyVal - freightVal - eachDiscount).toFixed(2);
             comissionEle.text(resVal);
         })
 

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-s.promotionFullReduction}</td>
+						<td>${s.income}</td>
 						<td>
 							<label class="clubFreight"  style="display: none">
 								<c:choose>
@@ -206,9 +206,8 @@
 					<tr>
 						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
 						<td colspan="3">${s.shopName}</td>
-						<td colspan="3" class="payCm-t">${s.income-s.shopPostFee-s.discountTotalFee-s.couponAmount-s.promotionFullReduction}</td>
+						<td colspan="3" class="payCm-t">子订单佣金</td>
 						<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
-
 						<td class="taxes">
 							<fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>
 						</td>
@@ -458,16 +457,17 @@
 			    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(',',''),
+				clubFreight = Number(thisEle.find('.clubFreight').text().replace(',','')),
+				discountFee = Number(thisEle.find('.discountFee').text().replace(',','')),
+				eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
                 totalComissionEle.each(function(){
                     totalComissionVal += Number($(this).text().replace(',',''));
 				})
-				resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
+				resVal = (totalComissionVal + clubFreight - thirdPartyVal - freightVal - eachDiscount).toFixed(2);
                 comissionEle.text(resVal);
 			})
 

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

@@ -439,15 +439,16 @@
                 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(',',''));
+            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(',','')),
+            eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
             totalComissionEle.each(function () {
                 totalComissionVal += Number($(this).text().replace(',', ''));
             })
-            resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
+            resVal = (totalComissionVal + clubFreight - thirdPartyVal - freightVal - eachDiscount).toFixed(2);
             comissionEle.text(resVal);
         })
 

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

@@ -413,7 +413,7 @@
         </div>
         <div class="payment-form-content">
             <c:forEach items="${cmPayShop.shopOrders}" var="s">
-               <input type="hidden" value="${promotionFull}" class="promotionFullReduction" ><%-- //满减优惠--%>
+               <input type="hidden" value="${eachDiscount}" class="eachDiscount" ><%-- //分摊优惠--%>
                 <table class="table table-striped table-bordered table-condensed pay-table">
                     <tr>
                         <th>订单编号(ID)</th>
@@ -426,7 +426,7 @@
                         <th>收款状态</th>
                         <th colspan="3">收款金额</th>
                         <th>经理折扣</th>
-                       <th>优惠券</th>
+                        <th>优惠券</th>
                     <tr/>
                     <tr>
                         <td> ${s.orderNo}(${s.orderID})</td>
@@ -528,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">
@@ -939,19 +939,20 @@
             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(',', ''),//供应商运费
-                couponAmount = Number(thisEle.find('.couponAmount').text().replace(',', '')),//优惠卷
-                discountFee = Number(thisEle.find('.discountFee').text().replace(',', ''));//经理折扣
-            promotionFullReduction=Number(thisEle.find('.promotionFullReduction').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(',', ''),//供应商运费
+            clubFreight = Number(thisEle.find('.clubFreight').text().replace(',', '')),//机构运费
+            discountFee = Number(thisEle.find('.discountFee').text().replace(',', '')),//经理折扣
+            eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
             totalComissionEle.each(function () {
                 totalComissionVal += Number($(this).text().replace(',', ''));
             })
             alert(promotionFullReduction.toFixed(2));
-            resVal = (totalComissionVal - discountFee - thirdPartyVal - freightVal-couponAmount-promotionFullReduction).toFixed(2);
-            comissionEle.text(promotionFullReduction.toFixed(2)+""+couponAmount.toFixed(2));
+            // 子订单佣金=单个商品总佣金+机构运费-付第三方-供应商运费-子订单分摊优惠
+            resVal = (totalComissionVal + clubFreight - thirdPartyVal - freightVal - eachDiscount).toFixed(2);
+            comissionEle.text(resVal);
         })
 
         $('.apply-btn').on('click', function () {

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

@@ -465,15 +465,16 @@
                 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(',',''));
+            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(',','')),
+            eachDiscount = Number(thisEle.find('.eachDiscount').text().replace(',',''));//分摊优惠
             totalComissionEle.each(function(){
                 totalComissionVal += Number($(this).text().replace(',',''));
             })
-            resVal = (totalComissionVal + clubFreight - discountFee - thirdPartyVal - freightVal).toFixed(2);
+            resVal = (totalComissionVal + clubFreight - thirdPartyVal - freightVal - eachDiscount).toFixed(2);
             comissionEle.text(resVal);
         })
     })()

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

@@ -759,7 +759,7 @@
     <div class="order-rows">
         <span><label>下单时间：</label>${order.orderTime}</span>
         <span><label>子订单号(ID)：</label>${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
-        <span><label>子订单金额：</label><fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
+        <span><label>子订单金额：</label><fmt:formatNumber value="${order.onlinePayFlag eq 0?shopOrder.realPay:shopOrder.needPayAmount}" type="currency"/></span>
         <c:if test="${shopOrder.postFeeCos eq '0'}">
             <div class="print-wrapper">
                 <a href="${ctx}/order/printOrder?shopOrderID=${shopOrder.shopOrderID}">打印</a>
@@ -771,8 +771,56 @@
                     <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>
                 </c:if>
             </div>
-            <c:if test="${order.status ne 0 && order.status ne 11}">
-                <div class="delivery-wrapper">
+        </c:if>
+        <c:if test="${order.onlinePayFlag eq 0}">
+            <br/>
+            <span>商品总额：<fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
+            <span>优惠：<fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
+            <span>应付金额：<fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
+            <span>已付金额：<fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/></span>
+            <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
+            <br/>
+            <span>收款状态：
+                <c:if test="${shopOrder.shopReceiptStatus == 1}">
+                    <font color="red">待收款</font>
+                </c:if>
+                <c:if test="${shopOrder.shopReceiptStatus == 2}">
+                    <font color="#ff8c00">部分收款</font>
+                </c:if>
+                <c:if test="${shopOrder.shopReceiptStatus == 3}">
+                    <font color="green">已收款</font>
+                </c:if>
+            </span>
+            <span>付款状态：
+                <c:if test="${shopOrder.payStatus == 1}">
+                    <font color="red">待付款</font>
+                </c:if>
+                <c:if test="${shopOrder.payStatus == 2}">
+                    <font color="#ff8c00">部分付款</font>
+                </c:if>
+                <c:if test="${shopOrder.payStatus == 3}">
+                    <font color="green">已付款</font>
+                </c:if>
+            </span>
+            <span>发货状态：
+                <c:if test="${shopOrder.sendOutStatus == 1}">
+                    <font color="red">待发货</font>
+                </c:if>
+                <c:if test="${shopOrder.sendOutStatus == 2}">
+                    <font color="#ff8c00">部分发货</font>
+                </c:if>
+                <c:if test="${shopOrder.sendOutStatus == 3}">
+                    <font color="green">已发货</font>
+                </c:if>
+            </span>
+            <c:if test="${not empty shopOrder.note}">
+                <span>留言：${shopOrder.note}</span>
+            </c:if>
+        </c:if>
+        <c:if test="${order.onlinePayFlag ne 1}">
+            <c:if test="${shopOrder.postFeeCos eq '0'}">
+                <c:if test="${order.status ne 0 && order.status ne 11}">
+                    <div class="delivery-wrapper">
                         <span>发货状态：
                             <c:if test="${shopOrder.sendOutStatus == 1}">
                                 <font color="red">待发货</font>
@@ -784,27 +832,27 @@
                                 <font color="green">已发货</font>
                             </c:if>
                         </span>
-                    <span>付款状态：<c:if test="${shopOrder.payStatus == 1}">
-                        <font color="red">待付款</font>
-                    </c:if>
+                        <span>付款状态：<c:if test="${shopOrder.payStatus == 1}">
+                            <font color="red">待付款</font>
+                        </c:if>
                                         <c:if test="${shopOrder.payStatus == 2}">
                                             <font color="#ff8c00">部分付款</font>
                                         </c:if>
                                         <c:if test="${shopOrder.payStatus == 3}">
                                             <font color="green">已付款</font>
                                         </c:if></span>
-                    <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
+                        <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
                                 <span>已付金额: <fmt:formatNumber value="${shopOrder.payed}" type="currency"/>
                                 </span>
-                    </c:if>
-                </div>
-            </c:if>
-            <c:if test="${not empty shopOrder.note}">
-                <div><label>留言：</label>${shopOrder.note}</div>
+                        </c:if>
+                    </div>
+                </c:if>
+                <c:if test="${not empty shopOrder.note}">
+                    <div><label>留言：</label>${shopOrder.note}</div>
+                </c:if>
             </c:if>
         </c:if>
     </div>
-
     <div class="order-rows">
         <span><label>供应商：</label>${shopOrder.shopName}</span>
         <c:if test="${shopOrder.shopPromotion ne null && shopOrder.shopPromotion.type eq 3}">

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

@@ -53,14 +53,15 @@
                 <option value="更改状态">更改状态</option>
             </select>
 
-    <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>
+        <label>添加时间：</label>
+        <label>注册时间：</label>
+        <form:input path="startTime" type="text" readonly="true" maxlength="20" class="input-mini Wdate" value="${startTime}"
+                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+        -
+        <form:input path="endTime" type="text" readonly="true" maxlength="20" class="input-mini Wdate" value="${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}"/>
@@ -92,7 +93,7 @@
             </td>
             <td>${empty cmop.operator ? "------" : cmop.operator}</td>
             <td>
-                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd"/>
+                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>
         </tr>
     </c:forEach>

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

@@ -50,15 +50,15 @@
                 <option value="更改状态">更改状态</option>
             </select>
         <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});"/>
+        <form:input path="startTime" type="text" readonly="true" maxlength="20" class="input-mini Wdate" value="${startTime}"
+                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+        -
+        <form:input path="endTime" type="text" readonly="true" maxlength="20" class="input-mini Wdate" value="${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>
+    </div>
 </form:form>
 <sys:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
@@ -89,7 +89,7 @@
             </td>
             <td>${empty cmop.operator ? "------" : cmop.operator}</td>
             <td>
-                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd"/>
+                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>
         </tr>
     </c:forEach>

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

@@ -719,7 +719,7 @@ function loadTown(curTown) {
 					</td>
 					<td>
 					<span>公司简称：</span>
-						<form:input path="sname" htmlEscape="false" placeholder="请输入公司简称" maxlength="10" class="input-xlarge "/>
+						<form:input path="sname" htmlEscape="false" placeholder="请输入公司简称" maxlength="10" class="input-xlarge"/>
 					</td>
 				</tr>
 				<tr>

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

@@ -560,7 +560,7 @@
                         <form:select path="townID" class="input-xlarge" id="town" style="width:100px;">
                             <form:option value="" label="区"/>
                         </form:select>
-                        <form:input path="address" class="input-xlarge userAddress" width="20px" maxlength="60"
+                        <form:input path="address" id="address" name="address" class="input-xlarge userAddress" width="20px" maxlength="60"
                                     placeholder="请填写会所详细的地址"/>
                     </div>
                 </div>
@@ -571,7 +571,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>营业执照编号：</b></label>
                     <div class="controls">
-                        <form:input path="socialCreditCode" htmlEscape="false" maxlength="18"
+                        <form:input path="socialCreditCode" name="socialCreditCode" htmlEscape="false" maxlength="18"
                                     class="input-xlarge" onchange="onlyNumOrLetter(this)"
                                     placeholder="请填写统一社会信用代码"/>
                     </div>
@@ -583,7 +583,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>营业执照：</b></label>
                     <div class="controls">
-                        <form:hidden id="businessLicenseImage" path="businessLicenseImage" htmlEscape="false"
+                        <form:hidden id="businessLicenseImage" name="businessLicenseImage" path="businessLicenseImage" htmlEscape="false"
                                      maxlength="255" class="input-xlarge required"/>
                         <sys:ckfinder input="businessLicenseImage" type="images" uploadPath="/photo"
                                       selectMultiple="false" maxWidth="100" maxHeight="100"/>
@@ -595,7 +595,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>门头照：</b></label>
                     <div class="controls">
-                        <form:hidden id="headpic" path="headpic" htmlEscape="false" maxlength="255"
+                        <form:hidden id="headpic" name="headpic" path="headpic" htmlEscape="false" maxlength="255"
                                      class="input-xlarge"/>
                         <sys:ckfinder input="headpic" type="images" uploadPath="/photo" maxWidth="100" maxHeight="100"/>
                         <font color="red">注意：请上传jpg/png格式的图片，最大不超过5M</font>
@@ -691,7 +691,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>固定电话：</b></label>
                     <div class="controls">
-                        <form:input path="contractPhone" htmlEscape="false" maxlength="11" class="input-xlarge"
+                        <form:input path="contractPhone" name="contractPhone" htmlEscape="false" maxlength="11" class="input-xlarge"
                                     onchange="int(this)"/>
                     </div>
                 </div>
@@ -699,7 +699,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>传真：</b></label>
                     <div class="controls">
-                        <form:input path="fax" htmlEscape="false" maxlength="18" class="input-xlarge"
+                        <form:input path="fax" name="fax" htmlEscape="false" maxlength="18" class="input-xlarge"
                                     onchange="int(this)"/>
                     </div>
                 </div>
@@ -710,7 +710,7 @@
                 <div class="control-group">
                     <label class="control-label"><b>员工人数：</b></label>
                     <div class="controls">
-                        <form:input path="empnum" htmlEscape="false" maxlength="18" class="input-xlarge"
+                        <form:input path="empnum" name="empnum" htmlEscape="false" maxlength="18" class="input-xlarge"
                                     onchange="onlyNumOrLetter(this)"/>
                     </div>
                 </div>
@@ -734,19 +734,19 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
                 <tr height="28">
                     <th>机构面积：</th>
-                    <td><form:input path="area" htmlEscape="false" class="input-medium" onkeyup="num(this)"/>
+                    <td><form:input path="area" name="area" htmlEscape="false" class="input-medium" onkeyup="num(this)"/>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>美容床数：</th>
-                    <td><form:input path="bedNums" htmlEscape="false" maxlength="11" class="input-medium"
+                    <td><form:input path="bedNums" name="bedNums" htmlEscape="false" maxlength="11" class="input-medium"
                                     onkeyup="int(this)"/>
                             <%--<input type="text" name="bedNums" value="${clubInfo.bedNums}">--%>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>美容师数：</th>
-                    <td><form:input path="beauticians" htmlEscape="false" maxlength="11" class="input-medium"
+                    <td><form:input path="beauticians" name="beauticians" htmlEscape="false" maxlength="11" class="input-medium"
                                     onkeyup="int(this)"/>
                     </td>
                 </tr>
@@ -757,19 +757,19 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
                 <tr height="28">
                     <th>月业绩：</th>
-                    <td><form:input path="monthAchievement" htmlEscape="false" maxlength="63" class="input-medium"
+                    <td><form:input path="monthAchievement" name="monthAchievement" htmlEscape="false" maxlength="63" class="input-medium"
                                     onkeyup="num(this)"/>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>促销业绩：</th>
-                    <td><form:input path="promotionAchievement" htmlEscape="false" maxlength="63" class="input-medium"
+                    <td><form:input path="promotionAchievement" name="promotionAchievement" htmlEscape="false" maxlength="63" class="input-medium"
                                     onkeyup="num(this)"/>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>年业绩：</th>
-                    <td><form:input path="yearAchievement" htmlEscape="false" maxlength="63" class="input-medium"
+                    <td><form:input path="yearAchievement" name="yearAchievement" htmlEscape="false" maxlength="63" class="input-medium"
                                     onkeyup="num(this)"/>
                     </td>
                 </tr>
@@ -781,25 +781,25 @@
                 <tr height="28">
                     <th>A类会员：</th>
                     <td colspan="3" style="padding-top: 6px;">
-                        <form:input path="cateA" htmlEscape="false" maxlength="11" class="cut-input-medium"
+                        <form:input path="cateA" name="cateA" htmlEscape="false" maxlength="11" class="cut-input-medium"
                                     onkeyup="int(this)"/>人&nbsp;
-                        <form:input path="consumeA" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
+                        <form:input path="consumeA" name="consumeA" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
                     </td>
                 </tr>
                 <tr height="28">
                     <th>B类会员：</th>
                     <td colspan="3" style="padding-top: 6px;">
-                        <form:input path="cateB" htmlEscape="false" maxlength="11" class="cut-input-medium"
+                        <form:input path="cateB" name="cateB"  htmlEscape="false" maxlength="11" class="cut-input-medium"
                                     onkeyup="int(this)"/>人&nbsp;
-                        <form:input path="consumeB" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
+                        <form:input path="consumeB" name="consumeB" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
                     </td>
                 </tr>
                 <tr height="28">
                     <th>C类会员：</th>
                     <td colspan="3" style="padding-top: 6px;">
-                        <form:input path="cateC" htmlEscape="false" maxlength="11" class="cut-input-medium"
+                        <form:input path="cateC" name="cateC" htmlEscape="false" maxlength="11" class="cut-input-medium"
                                     onkeyup="int(this)"/>人&nbsp;
-                        <form:input path="consumeC" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
+                        <form:input path="consumeC" name="consumeC" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>元
                     </td>
                 </tr>
             </table>
@@ -810,14 +810,14 @@
                 <tr height="28">
                     <th>最高业绩：</th>
                     <td>
-                        <form:input path="highestAchievement" htmlEscape="false" maxlength="63" class="input-medium"
+                        <form:input path="highestAchievement" name="highestAchievement" htmlEscape="false" maxlength="63" class="input-medium"
                                     onkeyup="num(this)"/>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>到店人数：</th>
                     <td>
-                        <form:input path="reachPepole" htmlEscape="false" maxlength="11" class="input-medium"
+                        <form:input path="reachPepole" name="reachPepole" htmlEscape="false" maxlength="11" class="input-medium"
                                     onkeyup="int(this)"/>
                     </td>
                 </tr>