小版本

src/main/java/com/caimei/modules/bulkpurchase/entity/CmClub.java

@@ -51,6 +51,7 @@ public class CmClub extends DataEntity<CmClub> {
 	private String contractEmail2;		// 联系邮箱
 	private String scope;		// 经营范围
 	private String info;		// 公司简介
+	private String firstClubType;	// 一级分类为医美=1和生美=2
 	private Double lng;		// 纬度
 	private Double lat;		// 经度
 	private String addTime;		// 注册时间
@@ -433,6 +434,14 @@ public class CmClub extends DataEntity<CmClub> {
 		this.info = info;
 	}
 
+	public String getFirstClubType() {
+		return firstClubType;
+	}
+
+	public void setFirstClubType(String firstClubType) {
+		this.firstClubType = firstClubType;
+	}
+
 	public Double getLng() {
 		return lng;
 	}

src/main/java/com/caimei/modules/bulkpurchase/entity/PurchaseProduct.java

@@ -26,6 +26,7 @@ public class PurchaseProduct extends DataEntity<PurchaseProduct> {
     private String productNo;        // 商品编号
     private Long productId;        // 商品ID
     private String shopName;        // 供应商名称
+    private String machineType;        // 械字号类型
     private String price;        // 当前单价
     private String discount;        // 折扣
     private String discountPrice;        // 折后单价
@@ -288,6 +289,14 @@ public class PurchaseProduct extends DataEntity<PurchaseProduct> {
         this.shopName = shopName;
     }
 
+    public String getMachineType() {
+        return machineType;
+    }
+
+    public void setMachineType(String machineType) {
+        this.machineType = machineType;
+    }
+
     public String getPrice() {
         return price;
     }

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

@@ -45,6 +45,8 @@ public interface NewOrderProductDao extends CrudDao<NewOrderProduct> {
 
     List<NewOrderProduct> findListByShopOrderID(@Param("shopOrderID") Integer shopOrderID);
 
+    List<NewOrderProduct> findListProductOrderID(@Param("orderID") Integer orderID);
+
     List<NewOrderProduct> getListByShopOrderID(@Param("shopOrderID") Integer shopOrderID);
 
     List<NewOrderProduct> findListByOrderID(@Param("orderID") Integer orderID);

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

@@ -68,6 +68,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String onlinePayFlag;//能否显示支付 ：0 能线上 1 线下
     private Double preferential; //总优惠 自助下单活动优惠 协销下单price-折后单价
     private String splitFlag; // 订单能否拆分 1 为可拆分, 0为不可拆分
+    private String closeTime;   // 订单关闭时间
     private String closeReason; //订单取消原因
     private String invoiceFlag;      //是否开发票 0 不开 1 开发票
     private Double discountAmount;  // 优惠金额：经理折扣+促销优惠+优惠券抵扣金额
@@ -817,6 +818,14 @@ public class NewOrder extends DataEntity<NewOrder> {
         this.confirmTime = confirmTime;
     }
 
+    public String getCloseTime() {
+        return closeTime;
+    }
+
+    public void setCloseTime(String closeTime) {
+        this.closeTime = closeTime;
+    }
+
     public String getCloseReason() {
         return closeReason;
     }

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

@@ -70,6 +70,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private Double preferential;//优惠 (price - discountPrice) * num
     private Double actPreferential;//活动优惠  类似满减优惠金额
     private Integer productType; //` CHAR(1) DEFAULT '0'  NULL   COMMENT '商品类型(0正常商品,1协商赠品,2促销赠品)
+    private Integer machineType;    //械字号类型   (基于械字号基础) ,1：一类，2：二类，3：三类
     private Integer promotionsId; //` INT(11) NULL   COMMENT '促销id
     private Integer orderPromotionsId; //` INT(11) NULL   COMMENT '订单促销id
     private String image; // 商品图片
@@ -165,6 +166,14 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
         this.productType = productType;
     }
 
+    public Integer getMachineType() {
+        return machineType;
+    }
+
+    public void setMachineType(Integer machineType) {
+        this.machineType = machineType;
+    }
+
     public Integer getOrderPromotionsId() {
         return orderPromotionsId;
     }

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

@@ -28,6 +28,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	private Double userMoney;	//账户余额
 	private Double ableUserMoney;	//可用余额
 	private Integer svipFlag;	//超级会员标识：1是，2不是
+	private String firstClubType;	//一级分类为医美=1和生美=2
 
 	public OrderUserInfo() {
 		super();
@@ -44,7 +45,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setOrderId(Long orderId) {
 		this.orderId = orderId;
 	}
-	
+
 	public Long getClubId() {
 		return clubId;
 	}
@@ -52,7 +53,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setClubId(Long clubId) {
 		this.clubId = clubId;
 	}
-	
+
 	public Long getUserId() {
 		return userId;
 	}
@@ -60,7 +61,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
-	
+
 	@Length(min=0, max=30, message="买家长度必须介于 0 和 30 之间")
 	public String getName() {
 		return name;
@@ -69,7 +70,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@Length(min=0, max=30, message="收货人长度必须介于 0 和 30 之间")
 	public String getShouHuoRen() {
 		return shouHuoRen;
@@ -78,7 +79,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setShouHuoRen(String shouHuoRen) {
 		this.shouHuoRen = shouHuoRen;
 	}
-	
+
 	@Length(min=0, max=20, message="手机长度必须介于 0 和 20 之间")
 	public String getMobile() {
 		return mobile;
@@ -87,7 +88,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
-	
+
 	@Length(min=0, max=20, message="电话长度必须介于 0 和 20 之间")
 	public String getPhone() {
 		return phone;
@@ -96,7 +97,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
-	
+
 	@Length(min=0, max=20, message="邮编长度必须介于 0 和 20 之间")
 	public String getPostalCode() {
 		return postalCode;
@@ -105,7 +106,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setPostalCode(String postalCode) {
 		this.postalCode = postalCode;
 	}
-	
+
 	@Length(min=0, max=20, message="省、直辖市长度必须介于 0 和 20 之间")
 	public String getProvince() {
 		return province;
@@ -114,7 +115,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setProvince(String province) {
 		this.province = province;
 	}
-	
+
 	@Length(min=0, max=20, message="市长度必须介于 0 和 20 之间")
 	public String getCity() {
 		return city;
@@ -123,7 +124,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setCity(String city) {
 		this.city = city;
 	}
-	
+
 	@Length(min=0, max=20, message="县、区长度必须介于 0 和 20 之间")
 	public String getTown() {
 		return town;
@@ -132,7 +133,7 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setTown(String town) {
 		this.town = town;
 	}
-	
+
 	@Length(min=0, max=255, message="收货地址长度必须介于 0 和 255 之间")
 	public String getAddress() {
 		return address;
@@ -167,4 +168,12 @@ public class OrderUserInfo extends DataEntity<OrderUserInfo> {
 	public void setSvipFlag(Integer svipFlag) {
 		this.svipFlag = svipFlag;
 	}
-}
+
+	public String getFirstClubType() {
+		return firstClubType;
+	}
+
+	public void setFirstClubType(String firstClubType) {
+		this.firstClubType = firstClubType;
+	}
+}

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

@@ -1279,6 +1279,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 if (club != null) {
                     //使用机构名称
                     orderUserInfo.setName(club.getName());
+                    orderUserInfo.setFirstClubType(club.getFirstClubType());
                 }
             }
             //获取订单商品
@@ -1608,6 +1609,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             cmUserBalanceRecordService.updateBalanceRecord(cmUserBalanceRecord);
         }
         order.setStatus("6");//订单状态变成交易关闭 6
+        order.setCloseReason("后台手动关闭");//   订单取消原因
         newOrderDao.updateStatus(order);
         //二手订单取消订单,标记未售
         if ("1".equals(order.getSecondHandOrderFlag())) {
@@ -2757,4 +2759,19 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     public List<SplitAccountPo> findSplitRecord(Integer orderID) {
         return newOrderDao.getSplitRecord(orderID);
     }
+
+    public String productDataVerification(Integer orderID,String firstClubType) {
+        String mes = "";
+        List<NewOrderProduct> productList = newOrderProductDao.findListProductOrderID(orderID);
+        if ("1".equals(firstClubType)) {
+            for (NewOrderProduct product : productList) {
+                if (product.getMachineType() == 3) {
+                    mes = "发货商品中存在械字号三类商品，机构资质不符合，确定发货吗？";
+                    break;
+                }
+            }
+            return mes;
+        }
+        return null;
+    }
 }

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

@@ -48,6 +48,7 @@ import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -383,6 +384,19 @@ public class NewOrderController extends BaseController {
         return "modules/order/secondProductOrderForm";
     }
 
+    /*@RequestMapping("/verify")
+    @ResponseBody
+    public Map<String, Object> verify(Integer clubId,Integer productId) {
+        Map<String,Object> map = new HashedMap();
+        Integer firstClubType = clubDao.selFirst(clubId);
+        String machineType = clubDao.selMachineType(productId);
+        if (firstClubType != null && StringUtils.isNotBlank(machineType)) {
+            map.put("code",1);
+        } else {
+            map.put("code",-1);
+        }
+        return map;
+    }*/
 
     @RequiresPermissions("order:order:edit")
     @RequestMapping(value = "save")
@@ -392,6 +406,24 @@ public class NewOrderController extends BaseController {
         if (!beanValidator(model, newOrder)) {
             return form(newOrder, model, request);
         }
+        if (newOrder.getClubID() != null && CollectionUtils.isEmpty(newOrder.getOrderProduct())) {
+            Integer firstClubType = clubDao.selFirst(newOrder.getClubID());
+            List<Integer> list = new ArrayList<>();
+            boolean bol = false;
+            newOrder.getOrderProduct().forEach(p -> {
+                list.add(p.getProductID());
+            });
+            List<String> machineType = clubDao.selMachineType(list);
+            for (String str : machineType) {
+                if ("3".equals(str)) {
+                    bol = true;
+                }
+            }
+            if (firstClubType == 1 && bol) {
+                model.addAttribute("message", "发货商品中存在械字号三类商品，机构资质不符合，确定发货吗？");
+                return form(newOrder, model, request);
+            }
+        }
         if (CollectionUtils.isEmpty(newOrder.getOrderProduct())) {
             model.addAttribute("message", "保存失败商品不能为空");
             return form(newOrder, model, request);
@@ -827,6 +859,19 @@ public class NewOrderController extends BaseController {
         return "modules/order/ship";
     }
 
+    @RequestMapping(value = "/shipDataVerification")
+    @ResponseBody
+    public Map<String,Object> shipData(Integer orderID,String firstClubType) {
+        Map<String, Object> map = new HashMap<>();
+        String mes = newOrderService.productDataVerification(orderID, firstClubType);
+        if (mes != null) {
+            map.put("code",1);
+            map.put("mes",mes);
+        } else {
+            map.put("code",-1);
+        }
+        return map;
+    }
     /**
      * 填写物流信息页面
      *
@@ -1293,7 +1338,20 @@ public class NewOrderController extends BaseController {
                 }
             }
         }
-
+        // 判断订单关闭环境
+        if (StringUtils.isNotBlank(order.getCloseReason())) {
+            if (order.getCloseReason().contains("超时")) {
+                order.setCloseReason("超时关闭");
+            } else if (order.getCloseReason().contains("后台手动关闭")) {
+                order.setCloseReason("后台手动关闭");
+            } else if (order.getCloseReason().contains("用户主动取消订单")) {
+                order.setCloseReason("客户主动关闭");
+            } else if (order.getCloseReason().contains("协销帮用户取消订单")) {
+                order.setCloseReason("协销关闭");
+            } else {
+                order.setCloseReason("未知");
+            }
+        }
         // 订单已收款才会出现抹平或者多收退余额，（已收再退款或者撤销退款订单即使存在抹平也需要当未抹平重新计算付款）
         String receiptStatus = order.getReceiptStatus();
         if (StringUtils.equals("3", receiptStatus)) {

src/main/java/com/caimei/modules/project/dao/ClubDao.java

@@ -6,6 +6,7 @@ import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by LG on 2017/1/9.
@@ -14,4 +15,8 @@ import java.util.Date;
 public interface ClubDao extends CrudDao<ClubModel> {
     int updateClubByClubId(@Param("clubID") Integer clubID, @Param("newSpID") Integer newSpID, @Param("date") String date);
     ClubModel getClubByUserId(@Param("clubID") Integer clubID);
+
+    Integer selFirst(@Param("clubId") Integer clubId);
+
+    List<String> selMachineType(@Param("productId") List<Integer> productIds);
 }

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

@@ -414,28 +414,48 @@ public class AgencyController extends BaseController {
         NewCmClub newCmClubs = sysLogService.newCmClub(newCmClub.getClubID());
         System.out.println("id>>>>>>>>>>"+ newCmClub.getClubID()+"<<<<<"+cmClubinfo.getUserID());
         CmClubinfo cmClubinfos = sysLogService.cmclubinfo(cmClubinfo.getClubInfoID());
-
+        int type = 0;
         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(newCmClubs!=null) {
+            if (StringUtils.isBlank(cmClubinfos.getHighestAchievement()) || null == cmClubinfos.getReachPepole() || null == cmClubinfos.getClinchPepole()) {
                 if (!"".equals(cmClubinfo.getHighestAchievement())  || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
                     list.add("新增了活动业绩信息");
+                    type = 1;
                 }
 
             } else {
-                if (!cmClubinfo.getHighestAchievement().equals(cmClubinfos.getHighestAchievement())) {
-                    list.add("修改了活动业绩的最高业绩信息");
+                if (StringUtils.isNotBlank(cmClubinfo.getHighestAchievement())) {
+                    if (!cmClubinfo.getHighestAchievement().equals(cmClubinfos.getHighestAchievement())) {
+                        list.add("修改了活动业绩的最高业绩信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了活动业绩的最高业绩信息");
+                    type = 1;
                 }
 
-                if (!cmClubinfo.getReachPepole().equals(cmClubinfos.getReachPepole())) {
-                    list.add("修改了活动业绩的到店人数信息");
+                if (cmClubinfo.getReachPepole() != null) {
+                    if (!cmClubinfo.getReachPepole().equals(cmClubinfos.getReachPepole())) {
+                        list.add("修改了活动业绩的到店人数信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了活动业绩的到店人数信息");
+                    type = 1;
                 }
-                if (!cmClubinfo.getClinchPepole().equals(cmClubinfos.getClinchPepole())) {
-                    list.add("修改了活动业绩的成交人数信息");
+
+                if (cmClubinfo.getClinchPepole() != null) {
+                    if (!cmClubinfo.getClinchPepole().equals(cmClubinfos.getClinchPepole())) {
+                        list.add("修改了活动业绩的成交人数信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了活动业绩的成交人数信息");
+                    type = 1;
                 }
             }
 
@@ -443,16 +463,35 @@ public class AgencyController extends BaseController {
             if (cmClubinfos.getConsumeA() == null || cmClubinfos.getConsumeB() == null || cmClubinfos.getConsumeC() == null) {
                 if (cmClubinfo.getConsumeA() != null || cmClubinfo.getConsumeB() != null || cmClubinfo.getConsumeC() != null) {
                     list.add("新增了会员消费金额信息");
+                    type = 1;
                 }
             } else {
-                if (!cmClubinfo.getConsumeA().equals(cmClubinfos.getConsumeA())) {
-                    list.add("修改了A类会员消费金额");
+                if (cmClubinfo.getConsumeA() != null) {
+                    if (!cmClubinfo.getConsumeA().equals(cmClubinfos.getConsumeA())) {
+                        list.add("修改了A类会员消费金额");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了A类会员消费金额");
+                    type = 1;
                 }
-                if (!cmClubinfo.getConsumeB().equals(cmClubinfos.getConsumeB())) {
-                    list.add("修改了B类会员消费金额");
+                if (cmClubinfo.getConsumeB() != null) {
+                    if (!cmClubinfo.getConsumeB().equals(cmClubinfos.getConsumeB())) {
+                        list.add("修改了B类会员消费金额");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了B类会员消费金额");
+                    type = 1;
                 }
-                if (!cmClubinfo.getConsumeC().equals(cmClubinfos.getConsumeC())) {
-                    list.add("修改了C类会员消费金额");
+                if (cmClubinfo.getConsumeC() != null) {
+                    if (!cmClubinfo.getConsumeC().equals(cmClubinfos.getConsumeC())) {
+                        list.add("修改了C类会员消费金额");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了C类会员消费金额");
+                    type = 1;
                 }
             }
 
@@ -460,16 +499,37 @@ public class AgencyController extends BaseController {
             if (cmClubinfos.getCateA() == null || cmClubinfos.getCateB() == null || cmClubinfos.getCateC() == null) {
                 if (null != cmClubinfo.getCateA() || null != cmClubinfo.getCateB() || null != cmClubinfo.getCateC()) {
                     list.add("新增了会员信息");
+                    type = 1;
                 }
             } else {
-                if (!cmClubinfo.getCateA().equals(cmClubinfos.getCateA())) {
-                    list.add("修改了A会员信息");
+                if (cmClubinfo.getCateA() != null) {
+                    if (!cmClubinfo.getCateA().equals(cmClubinfos.getCateA())) {
+                        list.add("修改了A会员信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了A会员信息");
+                    type = 1;
                 }
-                if (!cmClubinfo.getCateB().equals(cmClubinfos.getCateB())) {
-                    list.add("修改了B会员信息");
+
+                if (cmClubinfo.getCateB() != null) {
+                    if (!cmClubinfo.getCateB().equals(cmClubinfos.getCateB())) {
+                        list.add("修改了B会员信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了B会员信息");
+                    type = 1;
                 }
-                if (!cmClubinfo.getCateC().equals(cmClubinfos.getCateC())) {
-                    list.add("修改了C会员信息");
+
+                if (cmClubinfo.getCateC() != null) {
+                    if (!cmClubinfo.getCateC().equals(cmClubinfos.getCateC())) {
+                        list.add("修改了C会员信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了C会员信息");
+                    type = 1;
                 }
             }
 
@@ -477,18 +537,38 @@ public class AgencyController extends BaseController {
             if ("".equals(cmClubinfos.getMonthAchievement()) || "".equals(cmClubinfos.getPromotionAchievement()) || "".equals(cmClubinfos.getYearAchievement())) {
                 if (!"".equals(cmClubinfos.getMonthAchievement()) || !"".equals(cmClubinfos.getPromotionAchievement()) || !"".equals(cmClubinfos.getYearAchievement())) {
                     list.add("新增了业绩信息");
+                    type = 1;
                 }
 
             } else {
-                if (!cmClubinfo.getMonthAchievement().equals(cmClubinfos.getMonthAchievement())) {
-                    list.add("修改了月业绩信息");
+                if (cmClubinfo.getMonthAchievement() != null) {
+                    if (!cmClubinfo.getMonthAchievement().equals(cmClubinfos.getMonthAchievement())) {
+                        list.add("修改了月业绩信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了月业绩信息");
+                    type = 1;
                 }
 
-                if (!cmClubinfo.getPromotionAchievement().equals(cmClubinfos.getPromotionAchievement())) {
-                    list.add("修改了促销业绩信息");
+                if (cmClubinfo.getPromotionAchievement() != null) {
+                    if (!cmClubinfo.getPromotionAchievement().equals(cmClubinfos.getPromotionAchievement())) {
+                        list.add("修改了促销业绩信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了促销业绩信息");
+                    type = 1;
                 }
-                if (!cmClubinfo.getYearAchievement().equals(cmClubinfos.getYearAchievement())) {
-                    list.add("修改了年业绩信息");
+
+                if (cmClubinfo.getYearAchievement() != null) {
+                    if (!cmClubinfo.getYearAchievement().equals(cmClubinfos.getYearAchievement())) {
+                        list.add("修改了年业绩信息");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了年业绩信息");
+                    type = 1;
                 }
             }
 
@@ -496,157 +576,318 @@ public class AgencyController extends BaseController {
             if (cmClubinfos.getArea() == null || cmClubinfos.getBedNums() == null || cmClubinfos.getBeauticians() == null) {
                 if (null != cmClubinfo.getArea() || null != cmClubinfo.getBedNums() || null != cmClubinfo.getBeauticians()) {
                     list.add("更新了基本信息");
+                    type = 1;
                 }
             } else {
-                if (!cmClubinfo.getArea().equals(cmClubinfos.getArea())) {
-                    list.add("修改了机构面积");
+                if (cmClubinfo.getArea() != null) {
+                    if (!cmClubinfo.getArea().equals(cmClubinfos.getArea())) {
+                        list.add("修改了机构面积");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了机构面积");
+                    type = 1;
                 }
-                if (!cmClubinfo.getBedNums().equals(cmClubinfos.getBedNums())) {
-                    list.add("修改了美容床数");
+
+                if (cmClubinfo.getBedNums() != null) {
+                    if (!cmClubinfo.getBedNums().equals(cmClubinfos.getBedNums())) {
+                        list.add("修改了美容床数");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了美容床数");
+                    type = 1;
                 }
-                if (!cmClubinfo.getBeauticians().equals(cmClubinfos.getBeauticians())) {
-                    list.add("修改了美容师数");
+
+                if (cmClubinfo.getBeauticians() != null) {
+                    if (!cmClubinfo.getBeauticians().equals(cmClubinfos.getBeauticians())) {
+                        list.add("修改了美容师数");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了美容师数");
+                    type = 1;
                 }
             }
 
 
-            if (null == (newCmClubs.getInfo())) {
-                if (!"".equals(newCmClub.getInfo())) {
+            if (StringUtils.isNotBlank(newCmClubs.getInfo())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getInfo())) {
+                    if (!cmClubinfo.getInfo().equals(newCmClubs.getInfo())) {
+                        list.add("修改了公司简介");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了公司简介");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getInfo())) {
                     list.add("新增了公司简介");
+                    type = 1;
                 }
-            } else if (!newCmClub.getInfo().equals(newCmClubs.getInfo())) {
-                list.add("修改了公司简介");
             }
 
-            if (cmClubinfo.getEmpnum() != null) {
-                if (!cmClubinfo.getEmpnum().equals(cmClubinfos.getEmpnum())) {
-                    list.add("更新了公司人数");
+
+            if (cmClubinfos.getEmpnum() != null) {
+                if (cmClubinfo.getEmpnum() != null) {
+                    if (!cmClubinfo.getEmpnum().equals(cmClubinfos.getEmpnum())) {
+                        list.add("修改了公司人数");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了公司人数");
+                    type = 1;
+                }
+            } else {
+                if (cmClubinfo.getEmpnum() != null) {
+                    list.add("新增了公司人数");
+                    type = 1;
                 }
             }
-            if (null == (newCmClubs.getFax())) {
-                if (!"".equals(newCmClub.getFax())) {
+            if (StringUtils.isNotBlank(newCmClubs.getFax())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getFax())) {
+                    if (!cmClubinfo.getFax().equals(newCmClubs.getFax())) {
+                        list.add("修改了传真");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了传真");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getFax())) {
                     list.add("新增了传真");
+                    type = 1;
                 }
-            } else if (!newCmClub.getFax().equals(newCmClubs.getFax())) {
-                list.add("修改了传真");
             }
 
 
-            if (null == (newCmClubs.getContractPhone())) {
-                if (!"".equals(newCmClub.getContractPhone())) {
+            if (StringUtils.isNotBlank(newCmClubs.getContractPhone())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getContractPhone())) {
+                    if (!cmClubinfo.getContractPhone().equals(newCmClubs.getContractPhone())) {
+                        list.add("修改了固定电话");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了固定电话");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getContractPhone())) {
                     list.add("新增了固定电话");
+                    type = 1;
                 }
-            } else if (!newCmClub.getContractPhone().equals(newCmClubs.getContractPhone())) {
-                list.add("修改了固定电话");
             }
 
-            if (!newCmClub.getAddress().equals(newCmClubs.getAddress())) {
-                list.add("修改了详细地址");
+            if (StringUtils.isNotBlank(newCmClubs.getAddress())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getAddress())) {
+                    if (!cmClubinfo.getAddress().equals(newCmClubs.getAddress())) {
+                        list.add("修改了详细地址");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了详细地址");
+                    type = 1;
+                }
+            } else {
+                if (!"".equals(cmClubinfo.getAddress())) {
+                    list.add("新增了详细地址");
+                    type = 1;
+                }
             }
-            if (newCmClub.getLinkManIdentity() != null) {
-                if (!newCmClub.getLinkManIdentity().equals(newCmClubs.getLinkManIdentity())) {
-                    list.add("修改了联系人身份");
+
+            if (newCmClubs.getLinkManIdentity() != null) {
+                if (cmClubinfo.getLinkManIdentity() != null) {
+                    if (!cmClubinfo.getLinkManIdentity().equals(newCmClubs.getLinkManIdentity())) {
+                        list.add("修改了联系人身份");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了联系人身份");
+                    type = 1;
+                }
+            } else {
+                if (cmClubinfo.getLinkManIdentity() != null) {
+                    list.add("新增了联系人身份");
+                    type = 1;
                 }
             }
-            if (newCmClubs.getLinkMan() == null) {
-                if (newCmClub.getUserName() != null) {
+
+            if (StringUtils.isNotBlank(newCmClubs.getLinkMan())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getUserName())) {
+                    if (!cmClubinfo.getUserName().equals(newCmClubs.getLinkMan())) {
+                        list.add("修改了联系人");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了联系人");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getUserName())) {
                     list.add("新增了联系人");
+                    type = 1;
                 }
             }
-            if (!newCmClub.getUserName().equals(newCmClubs.getLinkMan())) {
-                list.add("修改了联系人");
-            }
 
-            if (newCmClubs.getMainpro() != null) {
-                if (!newCmClub.getMainpro().equals(newCmClubs.getMainpro())) {
-                    list.add("修改了主营内容");
+            if (StringUtils.isNotBlank(newCmClubs.getMainpro())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getMainpro())) {
+                    if (!cmClubinfo.getMainpro().equals(newCmClubs.getMainpro())) {
+                        list.add("修改了主营内容");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了主营内容");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getMainpro())) {
+                    list.add("新增了主营内容");
+                    type = 1;
                 }
             }
 
-            if (newCmClubs.getFirstClubType() == null) {
-                if (newCmClub.getFirstClubType() != null) {
+            if (StringUtils.isNotBlank(newCmClubs.getFirstClubType())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getFirstClubType())) {
+                    if (!cmClubinfo.getFirstClubType().equals(newCmClubs.getFirstClubType())) {
+                        list.add("修改了机构类型");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了机构类型");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getFirstClubType())) {
                     list.add("新增了机构类型");
+                    type = 1;
                 }
-            } else if (!newCmClub.getFirstClubType().equals(newCmClubs.getFirstClubType())) {
-                list.add("修改了机构类型");
             }
 
 
-            if (newCmClubs.getBusinessLicenseImage() == null) {
-                if (newCmClub.getBusinessLicenseImage() != null) {
-                    list.add("新增了营业执照");
+            if (StringUtils.isNotBlank(newCmClubs.getBusinessLicenseImage())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getBusinessLicenseImage())) {
+                    if (!cmClubinfo.getBusinessLicenseImage().equals(newCmClubs.getBusinessLicenseImage())) {
+                        list.add("修改了营业执照");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了营业执照");
+                    type = 1;
                 }
             } else {
-                if (!newCmClub.getBusinessLicenseImage().equals(newCmClubs.getBusinessLicenseImage())) {
-                    list.add("修改了营业执照");
+                if (StringUtils.isNotBlank(cmClubinfo.getBusinessLicenseImage())) {
+                    list.add("新增了营业执照");
+                    type = 1;
                 }
             }
 
 
-            if (newCmClubs.getHeadpic() == null) {
-                if (newCmClub.getHeadpic() != null) {
-                    list.add("新增了门头照");
+            if (StringUtils.isNotBlank(newCmClubs.getHeadpic())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getHeadpic())) {
+                    if (!cmClubinfo.getHeadpic().equals(newCmClubs.getHeadpic())) {
+                        list.add("修改了门头照");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了门头照");
+                    type = 1;
                 }
-                if (!newCmClub.getHeadpic().equals(newCmClubs.getHeadpic())) {
-                    list.add("修改了门头照");
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getHeadpic())) {
+                    list.add("新增了门头照");
+                    type = 1;
                 }
             }
 
 
-            if (newCmClubs.getSocialCreditCode() == null) {
-                if (newCmClub.getSocialCreditCode() != null) {
+            if (StringUtils.isNotBlank(newCmClubs.getSocialCreditCode())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getSocialCreditCode())) {
+                    if (!cmClubinfo.getSocialCreditCode().equals(newCmClubs.getSocialCreditCode())) {
+                        list.add("修改了营业执照编号");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了营业执照编号");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getSocialCreditCode())) {
                     list.add("新增了营业执照编号");
+                    type = 1;
                 }
             }
-            if (!newCmClub.getSocialCreditCode().equals(newCmClubs.getSocialCreditCode())) {
-                list.add("修改了营业执照编号");
-            }
 
 
-            if (newCmClubs.getAddress() == null) {
-                if (newCmClub.getAddress() != null) {
-                    list.add("新增了详细地址");
+            if (StringUtils.isNotBlank(newCmClubs.getSname())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getSname())) {
+                    if (!cmClubinfo.getSname().equals(newCmClubs.getSname())) {
+                        list.add("修改了机构简称");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了机构简称");
+                    type = 1;
                 }
-            }
-
-
-            if (newCmClubs.getSname() == null) {
-                if (newCmClub.getSname() != null) {
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getSname())) {
                     list.add("新增了机构简称");
+                    type = 1;
                 }
             }
-            if (!newCmClub.getSname().equals(newCmClubs.getSname())) {
-                list.add("修改了机构简称");
-            }
 
-            if (newCmClubs.getName() == null) {
-                if (newCmClub.getName() != null) {
+            if (StringUtils.isNotBlank(newCmClubs.getName())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getName())) {
+                    if (!cmClubinfo.getName().equals(newCmClubs.getName())) {
+                        list.add("修改了机构名称");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了机构名称");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getName())) {
                     list.add("新增了机构名称");
+                    type = 1;
                 }
             }
-            if (!newCmClub.getName().equals(newCmClubs.getName())) {
-                list.add("修改了机构名称");
-            }
 
-            if ("".equals(newCmClubs.getContractMobile())) {
-                if (!newCmClub.getBindMobile().equals(null)) {
+            if (StringUtils.isNotBlank(newCmClubs.getContractMobile())) {
+                if (StringUtils.isNotBlank(cmClubinfo.getBindMobile())) {
+                    if (!cmClubinfo.getBindMobile().equals(newCmClubs.getContractMobile())) {
+                        list.add("修改了手机号");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了手机号");
+                    type = 1;
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getBindMobile())) {
                     list.add("新增了手机号");
+                    type = 1;
                 }
             }
-            if (!newCmClub.getBindMobile().equals(newCmClubs.getContractMobile())) {
-                list.add("修改了手机号");
-            }
-            if ("".equals(newCmClubs.getContractEmail())) {
-                if (!newCmClub.getContractEmail().equals(null)) {
-                    list.add("新增了注册邮箱");
+
+            if (StringUtils.isNotBlank(newCmClub.getContractEmail())) {
+                if (StringUtils.isNotBlank(newCmClub.getContractEmail())) {
+                    if (!newCmClub.getContractEmail().equals(newCmClubs.getContractEmail())) {
+                        list.add("修改了邮箱");
+                        type = 1;
+                    }
+                } else {
+                    list.add("删除了邮箱");
+                    type = 1;
                 }
-            }
-            if (!"".equals(newCmClub.getContractEmail())) {
-                if (!newCmClub.getContractEmail().equals(newCmClubs.getContractEmail())) {
-                    list.add("修改了邮箱");
+            } else {
+                if (StringUtils.isNotBlank(newCmClub.getContractEmail())) {
+                    list.add("新增了注册邮箱");
+                    type = 1;
                 }
             }
-        }else {
+        } else {
             list.add("新机构添加了信息");
         }
         sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
@@ -743,6 +984,9 @@ public class AgencyController extends BaseController {
         newCmClub.setLinkManIdentity(cmClubinfo.getLinkManIdentity());
         newCmClub.setName(name);
         newCmClub.setSname(cmClubinfo.getSname());
+        if (type == 1) {
+            newCmClub.setLastModify(new Date());
+        }
         CmUser user = new CmUser();
         user.setUserID(newCmClub.getUserID());
         user.setEmail(cmClubinfo.getContractEmail());
@@ -751,7 +995,7 @@ 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());

src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml

@@ -58,7 +58,7 @@
     <select id="findList" resultType="CmClub">
 		SELECT
 		<include refid="cmClubColumns"/>
-		,d.name province,c.name city,b.name town,f.userMoney userMoney,f.ableUserMoney ableUserMoney,
+		,d.name province,c.name city,b.name town,f.userMoney userMoney,f.ableUserMoney ableUserMoney,a.firstClubType,
 		if(csu.id is not null,1,0) as svipFlag
 		FROM club a
 		LEFT JOIN town b ON b.townID=a.townID

src/main/resources/mappings/modules/bulkpurchase/PurchaseProductMapper.xml

@@ -42,7 +42,7 @@
 
     <select id="findList" resultType="PurchaseProduct">
         SELECT b.name shopName ,b.`shopID` shopId,a.name purchaseProductName,
-        a.`productID` productId,a.productCode productNo,a.mainImage image,a.includedTax AS includedTax,
+        a.`productID` productId,a.productCode productNo,a.mainImage image,a.includedTax AS includedTax,a.machineType,
         a.invoiceType AS invoiceType, a.taxPoint AS taxRate, a.supplierTaxPoint AS supplierTaxRate, a.commodityType,
         if(csp.id is not null and csu.id is not null and csp.status=0,1,0) as svipPriceFlag
         FROM product a LEFT JOIN shop b ON b.shopID=a.shopID

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

@@ -44,6 +44,7 @@
 		a.splitFlag AS splitFlag,
 		(select sum(cop.totalAddedValueTax) from cm_order_product cop where cop.orderID = a.orderID) AS totalAddedValueTax,
 		a.preferential AS preferential,
+		a.closeTime AS closeTime,
 		a.closeReason AS closeReason,
 		a.receiptStatus as receiptStatus,
 		a.payStatus	as payStatus,
@@ -131,6 +132,8 @@
         ''
         end) AS spName,
         co.rebateFlag AS rebateFlag,
+        co.closeTime AS closeTime,
+        co.closeReason AS closeReason,
         co.rebateFee AS rebateFee
         FROM cm_order co
         LEFT JOIN bp_order_userinfo bou ON bou.orderId = co.orderID
@@ -635,7 +638,8 @@
     <update id="updateStatus" parameterType="NewOrder">
         UPDATE cm_order
         SET status    = #{status},
-            closeTime = NOW()
+            closeTime = NOW(),
+            closeReason = #{closeReason}
         WHERE orderID = #{orderID}
     </update>
 

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

@@ -92,7 +92,8 @@
 		a.svipPriceType,
 		a.svipDiscount,
 		a.svipReduction,
-        p.returnGoodsStutas
+        p.returnGoodsStutas,
+        p.machineType
     </sql>
 
     <sql id="orderProductJoins">
@@ -117,6 +118,15 @@
         LEFT JOIN cm_second_hand_detail csdh ON csdh.productID = a.productID
         WHERE a.shopOrderID = #{shopOrderID}
     </select>
+    <select id="findListProductOrderID"  resultType="com.caimei.modules.order.entity.NewOrderProduct">
+        SELECT
+        <include refid="orderProductColumns"/>
+        ,csdh.secondHandType AS "secondHandType"
+        FROM cm_order_product a
+        <include refid="orderProductJoins"/>
+        LEFT JOIN cm_second_hand_detail csdh ON csdh.productID = a.productID
+        WHERE a.orderID = #{orderID}
+    </select>
 
     <select id="getListByShopOrderID" resultType="NewOrderProduct">
         select cop.*, cpo.touchPrice as touchPrice

src/main/resources/mappings/modules/project/ClubMapper.xml

@@ -35,13 +35,13 @@
 
 	<!--<select id="findAllList" resultType="ProjectOrder">
 	</select>
-	
+
 	<insert id="insert" parameterType="ProjectOrder"  keyProperty="id" useGeneratedKeys="true">
 	</insert>
-	
+
 	<update id="update">
 	</update>
-	
+
 	<delete id="delete">
 	</delete>-->
 
@@ -51,5 +51,15 @@
 		defaultServiceProviderUpdTime = #{date}
 		WHERE clubID = #{clubID}
 	</update>
-	
-</mapper>
+
+	<select id="selFirst" resultType="java.lang.Integer">
+		select firstClubType from club where clubID = #{clubId}
+	</select>
+
+	<select id="selMachineType" resultType="java.lang.String">
+		select machineType from product where productID in
+		<foreach collection="productIds" open="(" separator="," close=")" item="productId">
+			#{productId}
+		</foreach>
+	</select>
+</mapper>

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

@@ -10,7 +10,7 @@
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			
+
 		});
 		function page(n,s){
 			$("#pageNo").val(n);
@@ -74,10 +74,11 @@
 				<td style="display: none">${cmClub.defaultAddress.shouHuoRen}</td>
 				<td style="display: none">${cmClub.contractPhone}</td>
 				<td style="display: none">${cmClub.defaultAddress.phone}</td>
+				<td style="display: none">${cmClub.firstClubType}</td>
 			</tr>
 		</c:forEach>
 		</tbody>
 	</table>
 	<div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -609,6 +609,10 @@
                 <td style="display: none">
                     <input type="text" name="otherFee1" id="otherFee1${state.index}" onchange="otherFee(${state.index})"
                            style="width: 50px">
+                </td>
+                <td style="display: none">
+                    <input type="text" name="machineType" id="otherFee1${state.index}" value="${empty purchaseProduct.machineType ? " " :(purchaseProduct.machineType)}"
+                           style="width: 50px">
                 </td>
                     <%--采美应付金额--%>
                 <td style="display: none">

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

@@ -440,6 +440,9 @@
                         <c:if test="${s.status eq 11 || s.status eq 12 || s.status eq 13 ||s.status eq 21 ||s.status eq 22 ||
 				        s.status eq 23 || s.status eq 31 ||s.status eq 32 ||s.status eq 33}">交易中<br>(${fns:getDictLabel(s.status,"order_detail_status","" )})</c:if>
                         <c:if test="${s.status eq 0 || s.status eq 4 || s.status eq 5 || s.status eq 6 || s.status eq 7}">${fns:getDictLabel(s.status,"order_detail_status","" )}</c:if>
+                        <c:if test="${s.status eq 6}">
+                            <br>${s.closeTime ne null?s.closeTime:''}
+                        </c:if>
                     </td>
                     <td>
                         <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"

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

@@ -420,6 +420,16 @@
                 <c:if test="${order.status eq 0}">
                     <span id="time" style="color: red"></span>
                 </c:if>
+                <c:if test="${order.status eq 6}">
+                    <font color="red">(
+                            <c:if test="${order.closeTime ne null}">
+                                ${order.closeTime}
+                            </c:if>
+                            <c:if test="${order.closeReason ne null}">
+                                , ${order.closeReason}
+                            </c:if>
+                    )</font>
+                </c:if>
             </c:if>
         </td>
     </tr>
@@ -512,8 +522,18 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.buyer}<font id="svipFlagLabel" style="margin-left:10px"
-                                   color="red">${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}</font>
+        <td>机构：${order.buyer}
+            <font id="svipFlagLabel" style="margin-left:10px" color="red">
+                <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq 1}">
+                    (医美机构，超级会员)
+                </c:if>
+                <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq null}">
+                    ${order.bpOrderUserinfo.firstClubType eq 1?'(医美机构)':''}
+                </c:if>
+                <c:if test="${order.bpOrderUserinfo.firstClubType eq null and order.bpOrderUserinfo.svipFlag eq 1}">
+                    ${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}
+                </c:if>
+            </font>
             <c:if test="${order.organizeID >= 3}"><label
                     style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
@@ -983,6 +1003,9 @@
 <%--                        <c:if test="${order.returnGoodsStutas==1}">--%>
 <%--                            <div class="supplier-product-name"><label style="color: red">(能退货)</label></div>--%>
 <%--                        </c:if>--%>
+                        <c:if test="${op.machineType eq 3}">
+                            <div class="supplier-product-name"><font style="font-size: 16px" color="red">械字号三类</font></div>
+                        </c:if>
                     </div>
                     <c:if test="${op.productID ne 999}">
                         <div class="supplier-product-info">

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

@@ -6,6 +6,16 @@
     <title>订单管理</title>
     <meta name="decorator" content="default"/>
     <style>
+        .checked-tips{
+            padding:5px 10px;
+            background-color: rgba(255, 204, 204, 1);
+            text-align: left;
+            color: #333333;
+            line-height: 36px;
+            margin-top: 10px;
+            font-weight: bold;
+            display: none;
+        }
         .form-horizontal .controls {
             margin-left: 0
         }
@@ -186,6 +196,7 @@
             <form:hidden path="bpOrderUserinfo.id"/>
             <form:hidden path="bpOrderUserinfo.clubId" class="required"/>
             <form:hidden path="bpOrderUserinfo.userId"/>
+            <form:hidden path="bpOrderUserinfo.firstClubType"/>
             <thead>
             <c:if test="${empty order.confirmFlag || order.confirmFlag eq 0 }">
                 <input id="CmclubSelected" class="btn btn-primary" type="button" value="选择会所"
@@ -505,6 +516,7 @@
     </c:if>
     <br>
     <br>
+    <div class="checked-tips" id="checkedTips">特别注意：订单内含有械字号三类商品，客户为非医美机构，没有医疗执业许可证，不符合购买条件，请仔细确认是否要下单！</div>
     <table id="orderPrice" class="table table-striped table-bordered table-condensed">
         <thead>
         <tr>
@@ -1056,7 +1068,24 @@
                 $('.clauseId:checked').siblings('.clauseContent').attr("name", "clauseContent");
                 $('.clauseId:checked').siblings('.clauseName').attr("name", "clauseName");
             }
+/*
+            const productId = $('#productId').val()
+            const clubId = $("#bpOrderUserinfo\\.clubId").val();
 
+            cosnsole.log("productId"+productId);
+            cosnsole.log("clubId"+clubId);
+            return
+            $.ajax({
+                url: "${ctx}/order/verify?clubId="+clubId+"&productId="+productId,
+                type: "POST",
+                contentType: "application/json",
+                success: function(res) {
+                    if (res.code == 1) {
+                        // $.jBox.confirm(res.mes, "提示");
+                        type = 1;
+                    }
+                }
+            });*/
             // $('#inputForm').submit();
         })
     });

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

@@ -85,10 +85,12 @@
             <label>买家留言:</label>
             <span>${order.note}</span>
         </div>
+        <input id="orderID" type="hidden" value="${order.orderID}">
+        <input id="firstClubType" type="hidden" value="${order.bpOrderUserinfo.firstClubType}">
     </div>
     <div class="ship-shop">
         <form id="shipForm" method="post">
-        <div class="select-all"><input id="all" type="checkbox"><label for="all">全选</label></div>
+        <div class="select-all"><input id="all" type="checkbox" onchange="allMachineType()"><label for="all">全选</label></div>
         <table class="table">
             <tr>
                 <th>选择发货商品</th>
@@ -108,7 +110,7 @@
                 <tr ${orderProduct.notOutStore == 0 ? "style=background-color:#F5F5F5" : ''}>
                     <td>
                         <c:if test="${orderProduct.notOutStore != 0}">
-                            <input name="checked" type="checkbox">
+                            <input name="checked" type="checkbox" onclick="checkedProd(${orderProduct.machineType})">
                         </c:if>
                         <c:if test="${orderProduct.notOutStore == 0}">
                         </c:if>
@@ -142,6 +144,32 @@
 </div>
 <script type="text/javascript">
     var clickTime = 1;//防止多次发货请求
+    // 商品类型集合
+    var machineTypes = [];
+    var type = 0;
+    function allMachineType() {
+        var orderID = $("#orderID").val();
+        var firstClubType = $("#firstClubType").val();
+        $.ajax({
+            url: "${ctx}/order/shipDataVerification?orderID="+orderID+"&firstClubType="+firstClubType,
+            type: "POST",
+            contentType: "application/json",
+            success: function(res) {
+                if (res.code == 1) {
+                    // $.jBox.confirm(res.mes, "提示");
+                    type = 1;
+                }
+            }
+        });
+    }
+    function checkedProd(machineType) {
+        machineTypes.push(machineType)
+        /*console.log(machineTypes);
+        if (machineType === 3) {
+            $.jBox.confirm("发货商品中存在械字号三类商品，机构资质不符合，确定发货吗？","提示");
+            return;
+        }*/
+    }
     window.onload = function () {
         var params = {};
         var all_ = document.getElementById('all');//全选
@@ -356,12 +384,32 @@
     }
     //发货接口
     function goship(params) {
-        console.log("fahuole");
+        var msg = "确认发货吗？";
+        var firstClubType = $("#firstClubType").val();
         if (clickTime == 1) {
             clickTime = 2;
         } else {
             alertx('请勿重复点击');
         }
+        if (type === 1 || (machineTypes.includes("3") && firstClubType === 1)) {
+            msg = "发货商品中存在械字号三类商品，机构资质不符合，确定发货吗？"
+        }
+        $.jBox.confirm(msg,"提示", function (v,h,f) {
+            if (v == 'ok') {
+                $.ajax({
+                    url: "${ctx}/order/addLogisticsInfo",
+                    type: "POST",
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(params),
+                    success: function (res) {
+                        localStorage.setItem('jsonstring',JSON.stringify(res.data));
+                        window.location.href = '${ctx}/order/toShipLogistic?orderID=${order.orderID}'
+                    }
+                });
+            }
+        });
+        /*return;
         $.ajax({
             url: "${ctx}/order/addLogisticsInfo",
             type: "POST",
@@ -372,7 +420,7 @@
                 localStorage.setItem('jsonstring',JSON.stringify(res.data));
                 window.location.href = '${ctx}/order/toShipLogistic?orderID=${order.orderID}'
             }
-        });
+        });*/
     }
 </script>
 </body>

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

@@ -165,6 +165,7 @@
         <th>注册IP</th>
         <th>注册时间</th>
         <th>审核时间</th>
+        <th>修改时间</th>
         <shiro:hasPermission name="user:newCmClub:edit">
             <th>操作</th>
         </shiro:hasPermission>
@@ -295,6 +296,19 @@
             <td>
                     ${newCmClubList.auditTime}
             </td>
+            <td>
+                <c:if test="${newCmClubList.lastModify ne null}">
+<%--                    ${newCmClubList.lastModify}--%>
+                    <fmt:formatDate value="${newCmClubList.lastModify}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>
+                </c:if>
+                <c:if test="${newCmClubList.lastModify eq null and newCmClubList.addTime ne null}">
+                    ${newCmClubList.addTime}
+<%--                    <fmt:formatDate value="${newCmClubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
+                </c:if>
+                <c:if test="${newCmClubList.lastModify eq null and newCmClubList.addTime eq null}">
+                    ---
+                </c:if>
+            </td>
             <td>
                 <a href="${ctx}/new/user/agency/clubPortrait?clubID=${newCmClubList.clubID}&clubName=${newCmClubList.name}&dateType=0&type=4">机构画像</a>
                 <shiro:hasPermission name="club:cmAgency:edit">

src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -16,6 +16,7 @@ var couponPrice = 0;
 // 添加订单true,修改订单false
 var initFlag = true;
 var orderStatus = 0;
+var machineTypes = [];
 
 $(function () {
     /**  发票信息 start * */
@@ -286,6 +287,7 @@ function setSingleSelect(items) {
     console.log(info);
     $("#bpOrderUserinfo\\.clubId").val(info.id); //设置会所ID
     $("#bpOrderUserinfo\\.userId").val(info.userID);
+    $("#bpOrderUserinfo\\.firstClubType").val(info.firstClubType ? info.firstClubType :'');
     $("#inputForm").find("[name*='bpOrderUserinfo.province']").select2("val", info.province); //设置省份值
     $("#inputForm").find("[name*='bpOrderUserinfo.city']").select2("val", info.city);
     $("#inputForm").find("[name*='bpOrderUserinfo.town']").select2("val", info.town);
@@ -674,7 +676,12 @@ function resetProductList(setData, ind) {
 }
 
 function deleteShopProduct(obj) {
+    console.log('machineTypes',machineTypes)
+    var skuId = obj.parents('tr').find('.orderProductSkuId').text();
     obj.parents('tr').remove();
+    console.log('skuId======',skuId)
+    machineTypes =  machineTypes.filter(item => item.skuId !== skuId*1);
+    console.log('machineTypes======',machineTypes)
     var $table = obj.parents('tr').parents('table');
     if ($table.find('tr').length < 2) {
         //table里面没有商品了  table 也删掉   <2  是因为表头上有一个tr
@@ -845,11 +852,11 @@ function setProductList(data, flag, ind) {
     var price = "";
     if (data.skuList) {
         skuStr = "<td>" + data.skuList[0].unit + "</td>";
-        skuIdStr = "<td>" + data.skuList[0].skuId + "</td>";
+        skuIdStr = "<td class='orderProductSkuId'>" + data.skuList[0].skuId + "</td>";
         price = data.skuList[0].price;
     } else {
         skuStr = "<td>" + data.unit + "</td>";
-        skuIdStr = "<td>" + data.skuId + "</td>";
+        skuIdStr = "<td class='orderProductSkuId'>" + data.skuId + "</td>";
         price = data.price;
     }
 
@@ -871,7 +878,7 @@ function setProductList(data, flag, ind) {
     var ladderPrice = '';
     // 如果存在促销活动
     if (data.cmPromotion) {
-        debugger;
+        // debugger;
         var tempId = data.cmPromotion.id * 1;
         data.promotionsId = data.cmPromotion.id;
         // 没有折扣，才享受促销优惠
@@ -992,10 +999,19 @@ function setProductList(data, flag, ind) {
         "</td>" +
         "</tr>";
     appendProductList(str, data, cmPromotion, ind);
+    var firstClubType = $("#inputForm").find("[name*='bpOrderUserinfo.firstClubType']").val();
+    const hasSku = machineTypes.find(item => item.skuId === data.skuId)
+    !hasSku && machineTypes.push({ machineType : data.machineType , skuId: data.skuId })
+    console.log('machineTypes',machineTypes)
+    if(firstClubType !== '1' && machineTypes.find(item => item.machineType === '3')){
+        $('#checkedTips').show();
+    }else{
+        $('#checkedTips').hide();
+    }
 }
 
 function appendProductList(str, data, cmPromotion, ind) {
-    debugger
+    // debugger
     //把表中存在的删除
     var removeBeforeSoon = false; //是这一次移除
     var removeEle;
@@ -1091,7 +1107,7 @@ function setGiftHtmlList(data, cmPromotion) {
         $('.productTable tbody tr.gift_' + data.skuId).each(function (index, element) {
             $(this).remove();
         });
-        debugger;
+        // debugger;
         var skuStr = "赠品";
         if (data.skuStr) {
             var strings = data.skuStr.split("/");
@@ -1458,7 +1474,7 @@ function presentNum(index, type) {
 
 function setLadderPrice(obj, numVal, index) {
     if (obj["ladderPriceFlag"] * 1 === 1) {
-        debugger;
+        // debugger;
         var ladderList = obj["ladderPriceList"];
         var resultLadder = 0;
         for (var i = 0; i < ladderList.length; i++) {