bugfix

src/main/java/com/caimei/modules/archive/service/CmOrderArchiveService.java

@@ -51,16 +51,17 @@ public class CmOrderArchiveService extends CrudService<CmOrderArchiveDao, CmOrde
 
 	@Transactional(readOnly = false)
 	public void saveArchive(CmOrderArchive cmOrderArchive) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+        String date = format.format(new Date());
         if (cmOrderArchive.getIsNewRecord()) {
             cmOrderArchive.setAddTime(new Date());
         } else {
             CmOrderArchive dbOrderArchive = get(cmOrderArchive.getId());
             if (!cmOrderArchive.getShopOrderId().equals(dbOrderArchive.getShopOrderId()) ) {
                 cmOrderArchive.setUpdateShopOrderIdFlag(1);
+                date = format.format(cmOrderArchive.getAddTime());
             }
         }
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
-        String date = format.format(new Date());
         String orderArchiveNo = "CM-" + date + cmOrderArchive.getShopOrderId();
         cmOrderArchive.setArchiveNo(orderArchiveNo);
 		super.save(cmOrderArchive);

src/main/java/com/caimei/modules/cmpage/dao/CmPageCentreDao.java

@@ -28,9 +28,9 @@ public interface CmPageCentreDao extends CrudDao<CmPageCentre> {
 
     void saveSort(@Param("sort") String sort, @Param("id") String id);
 
-    NewPageFloorContent findFloorContentByCentreId(Integer centreId);
+    NewPageFloorContent findFloorContentByCentreId(@Param("centreId") Integer centreId);
 
-    List<NewPageFloorImage> findFloorImage(Integer centreId);
+    List<NewPageFloorImage> findFloorImage(@Param("centreId") Integer centreId, @Param("type") String type);
 
     void deletePageImage(String centreId);
 

src/main/java/com/caimei/modules/cmpage/service/CmPageCentreService.java

@@ -110,9 +110,9 @@ public class CmPageCentreService extends CrudService<CmPageCentreDao, CmPageCent
         cmPageCentreDao.saveSort(sort, id);
     }
 
-    public NewPageFloorContent findFloorContent(Integer centreId) {
+    public NewPageFloorContent findFloorContent(Integer centreId, String type) {
         NewPageFloorContent floorContent = cmPageCentreDao.findFloorContentByCentreId(centreId);
-        List<NewPageFloorImage> floorImageList = cmPageCentreDao.findFloorImage(centreId);
+        List<NewPageFloorImage> floorImageList = cmPageCentreDao.findFloorImage(centreId, type);
         floorImageList.forEach(image -> {
             if (image.getProductId() != null) {
                 Product product = productDao.get(image.getProductId().toString());

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -85,6 +85,10 @@ public class CmPageCentreController extends BaseController {
         if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())) {
             return "modules/cmpage/cmPageActivityCentreList";
         }
+        //呵呵商城首页楼层
+        if ("8".equals(cmPageCentre.getType())) {
+            return "modules/hehe/cmHeheCentreList";
+        }
         return "modules/cmpage/cmPageCentreList";
     }
 
@@ -100,6 +104,10 @@ public class CmPageCentreController extends BaseController {
         if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())) {
             return "modules/cmpage/cmPageActivityCentreForm";
         }
+        //呵呵商城商品楼层
+        if ("8".equals(cmPageCentre.getType())) {
+            return "modules/hehe/cmHeheCentreForm";
+        }
         return "modules/cmpage/cmPageCentreForm";
     }
 
@@ -111,8 +119,10 @@ public class CmPageCentreController extends BaseController {
         }
         cmPageCentreService.save(cmPageCentre);
         addMessage(redirectAttributes, "保存成功");
-        //清除产品仪器缓存
-        cleanRedisCache();
+        if (!"8".equals(cmPageCentre.getType())) {
+            //清除产品仪器缓存
+            cleanRedisCache();
+        }
         return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + cmPageCentre.getPageId() + "&type=" + cmPageCentre.getType();
     }
 
@@ -218,7 +228,7 @@ public class CmPageCentreController extends BaseController {
 
     @RequestMapping(value = "goContentPage")
     public String goContentPage(NewPageFloorContent newPageFloorContent, Model model) {
-        NewPageFloorContent floorContent = cmPageCentreService.findFloorContent(newPageFloorContent.getCentreId());
+        NewPageFloorContent floorContent = cmPageCentreService.findFloorContent(newPageFloorContent.getCentreId(), newPageFloorContent.getType());
         floorContent.setPageId(newPageFloorContent.getPageId());
         floorContent.setType(newPageFloorContent.getType());
         floorContent.setRedirectFlag(1);
@@ -229,6 +239,9 @@ public class CmPageCentreController extends BaseController {
         if ("7".equals(newPageFloorContent.getType())) {
             return "modules/newhome/beautyFloorContentForm";
         }
+        if ("8".equals(newPageFloorContent.getType())) {
+            return "modules/hehe/cmHeheFloorContentForm";
+        }
         return "modules/newhome/newPageFloorContentForm";
     }
 

src/main/java/com/caimei/modules/hehe/dao/CmHeheActivityProductDao.java

@@ -17,12 +17,6 @@ import java.util.List;
  */
 @MyBatisDao
 public interface CmHeheActivityProductDao extends CrudDao<CmHeheActivityProduct> {
-    /**
-     * 查询活动商品id
-     *
-     * @return
-     */
-    List<Integer> findActivityProductId();
 
     /**
      * 查询呵呵商城所有上架商品
@@ -71,7 +65,5 @@ public interface CmHeheActivityProductDao extends CrudDao<CmHeheActivityProduct>
      */
     void deleteUserActivity(Integer productId);
 
-    List<Integer> findCollageProductId();
-
     void updateProductId(@Param("newProductId") Integer newProductId, @Param("oldProductId") Integer oldProductId);
 }

src/main/java/com/caimei/modules/hehe/dao/CmHeheCollageProductDao.java

@@ -17,10 +17,6 @@ public interface CmHeheCollageProductDao extends CrudDao<CmHeheCollageProduct> {
 
     void updateStatus(@Param("id") Integer id,@Param("status") Integer status);
 
-    List<Integer> findExistProductIds();
-
-    List<Integer> findActivityProductIds();
-
     Integer getProductId(Integer heheProductId);
 
     void updateProductId(@Param("newProductId") Integer newProductId, @Param("oldProductId") Integer oldProductId);

src/main/java/com/caimei/modules/hehe/dao/CmHeheProductDao.java

@@ -56,4 +56,28 @@ public interface CmHeheProductDao extends CrudDao<CmHeheProduct> {
     void updateProductId(@Param("oldProductId") Integer oldProductId, @Param("newProductId") Integer newProductId);
 
     Integer getNewProductId(Integer oldProductId);
+
+    List<Integer> findHeHeFloorProductIds();
+
+    List<Product> findAllHeheProduct(Product product);
+
+
+    /**
+     * 查询活动商品id
+     *
+     * @return
+     */
+    List<Integer> findActivityProductIds();
+
+    /**
+     * 查询拼团商品id
+     * @return
+     */
+    List<Integer> findCollageProductIds();
+
+    /**
+     * 查询限时特价商品id
+     * @return
+     */
+    List<Integer> findDiscountProductIds();
 }

src/main/java/com/caimei/modules/hehe/dao/HeHeNewOrderDao.java

@@ -34,4 +34,10 @@ public interface HeHeNewOrderDao extends CrudDao<NewOrder> {
      * @return
      */
     Double findReductionTouchPrice(Integer orderID);
+
+    /**
+     * 取消订单
+     * @param orderID
+     */
+    void cancleOrder(Integer orderID);
 }

src/main/java/com/caimei/modules/hehe/entity/CmHeheCoupon.java

@@ -22,7 +22,7 @@ public class CmHeheCoupon extends DataEntity<CmHeheCoupon> {
 	private Date endTime;		// 下架时间
 	private Integer startNowFlag;		// 立即上架标记 0否 1是
 	private Integer permanentFlag;		// 永久上架标记 0否 1是
-	private Integer couponType;		// 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+	private Integer couponType;		// 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
 	private Integer productType;		// 优惠商品：1全商城商品 2指定商品(活动券有效)
 	private Integer receivePeriod;		// 领取期限（天）
 	private Integer receiveFlag;		// 领取期限同上下架时间标记（在上下架期间内都可领取）

src/main/java/com/caimei/modules/hehe/entity/CmHeheCouponOrderRecord.java

@@ -22,7 +22,7 @@ public class CmHeheCouponOrderRecord implements Serializable {
      */
     private Integer receiveCouponId;
     /**
-     * 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+     * 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
      */
     private Integer couponType;
     /**

src/main/java/com/caimei/modules/hehe/entity/CmHeheImage.java

@@ -16,6 +16,7 @@ public class CmHeheImage extends DataEntity<CmHeheImage> {
 	private static final long serialVersionUID = 1L;
 	private String topic;		// 主题
 	private String image;		// 图片
+	private String link;		// 跳转链接
 	private String sort;		// 排序值
 	private String status;		// 小程序状态:1启用,2停用
 	private Date addTime;		// 添加时间
@@ -70,5 +71,12 @@ public class CmHeheImage extends DataEntity<CmHeheImage> {
 	public void setAddTime(Date addTime) {
 		this.addTime = addTime;
 	}
-	
+
+	public String getLink() {
+		return link;
+	}
+
+	public void setLink(String link) {
+		this.link = link;
+	}
 }

src/main/java/com/caimei/modules/hehe/entity/CmHeheProduct.java

@@ -33,6 +33,8 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
     private String mainImage;       //商品图片
     private String shopName;        //供应商名称
     private List<Integer> ids;             //刚添加的活动id
+    private Integer bigTypeId;      // 一级分类id
+    private Integer smallTypeId;    // 二级分类id
 
     private Integer activityId;     //活动id
     private String floorIds;        //楼层id，以，隔开
@@ -193,4 +195,20 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
     public void setOldProductId(Integer oldProductId) {
         this.oldProductId = oldProductId;
     }
+
+    public Integer getBigTypeId() {
+        return bigTypeId;
+    }
+
+    public void setBigTypeId(Integer bigTypeId) {
+        this.bigTypeId = bigTypeId;
+    }
+
+    public Integer getSmallTypeId() {
+        return smallTypeId;
+    }
+
+    public void setSmallTypeId(Integer smallTypeId) {
+        this.smallTypeId = smallTypeId;
+    }
 }

src/main/java/com/caimei/modules/hehe/entity/CmHeheReceiveUser.java

@@ -29,7 +29,7 @@ public class CmHeheReceiveUser extends DataEntity<CmHeheReceiveUser> {
     private String nickName;    //微信昵称
     private String mobile;      //手机号
     private Integer userIdentity;       // 用户身份：1普通用户 2分销者
-    private Integer couponType;        // 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+    private Integer couponType;        // 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal touchPrice;        // 优惠满减条件金额
     private Integer couponStatus;    // 状态 0未生效 1已生效 2已关闭 3已失效

src/main/java/com/caimei/modules/hehe/service/CmHeheActivityProductService.java

@@ -1,6 +1,7 @@
 package com.caimei.modules.hehe.service;
 
 import com.caimei.modules.hehe.dao.CmHeheActivityProductDao;
+import com.caimei.modules.hehe.dao.CmHeheProductDao;
 import com.caimei.modules.hehe.entity.CmHeHeActivityLadder;
 import com.caimei.modules.hehe.entity.CmHeheActivityProduct;
 import com.caimei.modules.hehe.entity.CmHeheProduct;
@@ -28,6 +29,9 @@ public class CmHeheActivityProductService extends CrudService<CmHeheActivityProd
     @Autowired
     private CmHeheActivityProductDao activityProductDao;
 
+    @Autowired
+    private CmHeheProductDao cmHeheProductDao;
+
     public CmHeheActivityProduct get(String id) {
         CmHeheActivityProduct activityProduct = super.get(id);
         List<CmHeHeActivityLadder> activityLadderList = activityProductDao.findActivityLadder(activityProduct.getActivityId(), activityProduct.getProductId());
@@ -61,10 +65,13 @@ public class CmHeheActivityProductService extends CrudService<CmHeheActivityProd
     }
 
     public Page<CmHeheProduct> findProductPage(Page<CmHeheProduct> productPage, CmHeheProduct product) {
-        List<Integer> productIds = activityProductDao.findActivityProductId();
+        List<Integer> productIds = cmHeheProductDao.findActivityProductIds();
         // 已参与拼团商品id
-        List<Integer> collageProductIds = activityProductDao.findCollageProductId();
+        List<Integer> collageProductIds = cmHeheProductDao.findCollageProductIds();
+        // 已参与限时特价的商品id
+        List<Integer> discountProductIds = cmHeheProductDao.findDiscountProductIds();
         productIds.addAll(collageProductIds);
+        productIds.addAll(discountProductIds);
         product.setIds(productIds);
         product.setPage(productPage);
         List<CmHeheProduct> productList = activityProductDao.findAllHeHeProduct(product);

src/main/java/com/caimei/modules/hehe/service/CmHeheCollageProductService.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.caimei.modules.hehe.dao.CmHeheFloorProductDao;
+import com.caimei.modules.hehe.dao.CmHeheProductDao;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.utils.AppUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +34,9 @@ public class CmHeheCollageProductService extends CrudService<CmHeheCollageProduc
 	@Resource
 	private CmHeheCollageProductDao cmHeheCollageProductDao;
 
+	@Resource
+	private CmHeheProductDao cmHeheProductDao;
+
 	public CmHeheCollageProduct get(String id) {
 		return super.get(id);
 	}
@@ -68,10 +72,13 @@ public class CmHeheCollageProductService extends CrudService<CmHeheCollageProduc
 		product.setPage(productPage);
 		product.setSearchType(2);
 		// 已参与拼团商品id
-		List<Integer> productIds = cmHeheCollageProductDao.findExistProductIds();
+		List<Integer> productIds = cmHeheProductDao.findCollageProductIds();
 		// 已参与商品活动商品id
-		List<Integer> actProductIds = cmHeheCollageProductDao.findActivityProductIds();
+		List<Integer> actProductIds = cmHeheProductDao.findActivityProductIds();
+		// 已参与限时特价活动商品id
+		List<Integer> discountProductIds = cmHeheProductDao.findDiscountProductIds();
 		productIds.addAll(actProductIds);
+        productIds.addAll(discountProductIds);
 		product.setIds(productIds);
 		List<Product> productList = cmHeheFloorProductDao.findAllProduct(product);
 		if (productList != null && productList.size() > 0) {

src/main/java/com/caimei/modules/hehe/service/CmHeheProductService.java

@@ -7,15 +7,16 @@ import com.caimei.modules.product.entity.Product;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
 import com.caimei.utils.StringUtil;
-import com.caimei.utils.StringUtils;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
+import com.thinkgem.jeesite.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -65,12 +66,12 @@ public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHehePr
             if (newActivityId != null) {
                 cmHeheProductDao.addActivityProduct(cmHeheProduct.getProductId(), newActivityId);
             }
-            String newFloorIds = cmHeheProduct.getFloorIds();
+            /*String newFloorIds = cmHeheProduct.getFloorIds();
             String[] floorIdArr = newFloorIds.split(",");
             for (int i = 0; i < floorIdArr.length; i++) {
                 String floorId = floorIdArr[i];
                 cmHeheProductDao.addFloorProduct(cmHeheProduct.getId(), floorId);
-            }
+            }*/
         }
     }
 
@@ -112,4 +113,25 @@ public class CmHeheProductService extends CrudService<CmHeheProductDao, CmHehePr
         cmHeheProductDao.update(cmHeheProduct);
     }
 
+    public Page<Product> findHeheFloorProduct(Page<Product> productPage, Product product) {
+        product.setPage(productPage);
+        List<Integer> ids = new ArrayList<>();
+        if (com.thinkgem.jeesite.common.utils.StringUtils.isNotBlank(product.getProductIds())) {
+            String[] productIds = product.getProductIds().split(",");
+            for (String productId : productIds) {
+                if (StringUtils.isNotBlank(productId)) {
+                    ids.add(Integer.valueOf(productId));
+                }
+            }
+        }
+        product.setIds(ids);
+        List<Product> productList = cmHeheProductDao.findAllHeheProduct(product);
+        productList.forEach(item -> {
+            if (StringUtil.isNotBlank(item.getMainImage())) {
+                item.setMainImage(AppUtils.getImageURL("product", item.getMainImage(), 0, "https://www.caimei365.com/"));
+            }
+        });
+        productPage.setList(productList);
+        return productPage;
+    }
 }

src/main/java/com/caimei/modules/hehe/service/HeHeNewOrderService.java

@@ -13,16 +13,22 @@ import com.caimei.modules.user.dao.CmUserDao;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.utils.AppKeys;
 import com.caimei.utils.AppUtils;
+import com.caimei.utils.MathUtil;
 import com.caimei.utils.SysConfig;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -290,4 +296,214 @@ public class HeHeNewOrderService extends CrudService<HeHeNewOrderDao, NewOrder>
         }
         return pageResult;
     }
+
+    @Transactional(readOnly = false)
+    public void cancelOrder(Integer orderID) {
+        heHeNewOrderDao.cancleOrder(orderID);
+    }
+
+    public String batchExportOrder(List<NewOrder> orderList, OutputStream outputStream) {
+        try {
+            HSSFWorkbook workbook = new HSSFWorkbook();
+            // 创建机构工作表
+            HSSFSheet productSheet = workbook.createSheet("订单列表");
+            // sheet样式定义
+            HSSFCellStyle topCellStyle = this.getTopCellStyle(workbook);
+            HSSFCellStyle customCellStyle = this.getCustomCellStyle(workbook);
+            // 创建列头行
+            HSSFRow productTopRow = productSheet.createRow(0);
+            // 添加列头单元格(5个固定列+参数列表)
+            String[] rowName = {"订单ID", "下单时间", "订单编号", "商品名称",
+                    "商品规格", "商品单价", "收货人", "数量", "订单金额"};
+            for (int i = 0; i < rowName.length; i++) {
+                HSSFCell productTopRowCell = productTopRow.createCell(i);
+                productTopRowCell.setCellType(CellType.valueOf("STRING"));
+                HSSFRichTextString columnText = new HSSFRichTextString(rowName[i]);
+                productTopRowCell.setCellValue(columnText);
+                productTopRowCell.setCellStyle(topCellStyle);
+            }
+            // 合计
+            BigDecimal totalAmount = BigDecimal.ZERO;
+            int productRowNum = 1;
+            for (NewOrder order : orderList) {
+                List<NewOrderProduct> orderProducts = order.getNewOrderProducts();
+                int startRowNum = productRowNum;
+                for (int i = 0; i < orderProducts.size(); i++) {
+                    // 订单下商品数量+1
+                    NewOrderProduct product = orderProducts.get(i);
+                    // 组装商品数据
+                    List<Object> productData = new ArrayList<>();
+                    productData.add(order.getOrderID());
+                    productData.add(order.getOrderTime());
+                    productData.add(product.getOrderNo());
+                    productData.add(product.getName());
+                    productData.add(product.getProductUnit());
+                    productData.add(product.getDiscountPrice());
+                    productData.add(order.getReceiver());
+                    productData.add(product.getNum());
+                    productData.add(product.getTotalFee());
+                    totalAmount = MathUtil.add(totalAmount, product.getTotalFee());
+                    // 创建商品行
+                    HSSFRow productRow = productSheet.createRow(productRowNum);
+                    // 设置行高度
+                    productRow.setHeight((short) 1000);
+                    if (i == 0) {
+                        // 订单的第一个商品行存入公用单元格数据
+                        for (int j = 0; j < 3; j++) {
+                            HSSFCell productCell = productRow.createCell(j);
+                            productCell.setCellType(CellType.valueOf("STRING"));
+                            productCell.setCellValue(productData.get(j).toString());
+                            productCell.setCellStyle(customCellStyle);
+                        }
+                    }
+                    for (int j = 3; j < 9; j++) {
+                        HSSFCell productCell = productRow.createCell(j);
+                        if (j == 5 ||  j == 8) {
+                            productCell.setCellValue((Double) productData.get(j));
+                        } else if (j == 7) {
+                            productCell.setCellValue((Integer)productData.get(j));
+                        } else {
+                            productCell.setCellValue(productData.get(j).toString());
+                        }
+                        productCell.setCellStyle(customCellStyle);
+                    }
+                    productRowNum++;
+                }
+                if (startRowNum != productRowNum - 1) {
+                    // 当一个订单中有多个商品时，合并公用单元格
+                    for (int i = 0; i < 3; i++) {
+                        productSheet.addMergedRegion(new CellRangeAddress(startRowNum, productRowNum - 1, i, i));
+                    }
+                }
+            }
+            // 创建合计行
+            HSSFRow sumRow = productSheet.createRow(productRowNum);
+            // 设置行高度
+            sumRow.setHeight((short) 1000);
+            HSSFCell cell1 = sumRow.createCell(1);
+            HSSFCell cell2 = sumRow.createCell(8);
+            cell1.setCellType(CellType.valueOf("STRING"));
+            cell1.setCellValue("合计");
+            cell1.setCellStyle(customCellStyle);
+            cell2.setCellType(CellType.valueOf("STRING"));
+            cell2.setCellValue(totalAmount.toString());
+            cell2.setCellStyle(customCellStyle);
+            // 让列宽随着导出的列长自动适应
+            for (int colNum = 0; colNum< 9; colNum++) {
+                int productColumnWidth = productSheet.getColumnWidth(colNum) / 256;
+                for (int rowNum = 0; rowNum < productSheet.getLastRowNum(); rowNum++) {
+                    HSSFRow currentRow;
+                    // 当前行未被使用过
+                    if (productSheet.getRow(rowNum) == null) {
+                        currentRow = productSheet.createRow(rowNum);
+                    } else {
+                        currentRow = productSheet.getRow(rowNum);
+                    }
+                    if (currentRow.getCell(colNum) != null) {
+                        HSSFCell currentCell = currentRow.getCell(colNum);
+                        if (currentCell.getCellTypeEnum().equals(CellType.valueOf("STRING"))) {
+                            int length = currentCell.getStringCellValue()
+                                    .getBytes().length;
+                            if (productColumnWidth < length) {
+                                productColumnWidth = length;
+                            }
+                        }
+                    }
+                }
+                productSheet.setColumnWidth(colNum, (productColumnWidth + 4) * 256);
+            }
+            outputStream.flush();
+            workbook.write(outputStream);
+            outputStream.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "导出失败";
+        }
+        return "导出成功";
+    }
+
+
+    /**
+     * 列头单元格样式
+     */
+    private HSSFCellStyle getTopCellStyle(HSSFWorkbook workbook) {
+
+        // 设置字体
+        HSSFFont font = workbook.createFont();
+        // 设置字体大小
+        font.setFontHeightInPoints((short) 11);
+        // 字体加粗
+        font.setBold(true);
+        // 设置字体名字
+        font.setFontName("Courier New");
+        // 设置样式;
+        HSSFCellStyle style = workbook.createCellStyle();
+        // 设置底边框;
+        style.setBorderBottom(BorderStyle.THIN);
+        // 设置底边框颜色;
+        style.setBottomBorderColor(IndexedColors.BLACK.index);
+        // 设置左边框;
+        style.setBorderLeft(BorderStyle.THIN);
+        // 设置左边框颜色;
+        style.setLeftBorderColor(IndexedColors.BLACK.index);
+        // 设置右边框;
+        style.setBorderRight(BorderStyle.THIN);
+        // 设置右边框颜色;
+        style.setRightBorderColor(IndexedColors.BLACK.index);
+        // 设置顶边框;
+        style.setBorderTop(BorderStyle.THIN);
+        // 设置顶边框颜色;
+        style.setTopBorderColor(IndexedColors.BLACK.index);
+        // 在样式用应用设置的字体;
+        style.setFont(font);
+        // 设置自动换行;
+        style.setWrapText(false);
+        // 设置水平对齐的样式为居中对齐;
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 设置垂直对齐的样式为居中对齐;
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+
+        return style;
+    }
+
+    /**
+     * 列数据信息单元格样式
+     */
+    private HSSFCellStyle getCustomCellStyle(HSSFWorkbook workbook) {
+        // 设置字体
+        HSSFFont font = workbook.createFont();
+        // 设置字体大小
+         font.setFontHeightInPoints((short)11);
+        // 字体加粗
+        // font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        // 设置字体名字
+        font.setFontName("宋体");
+        // 设置样式;
+        HSSFCellStyle style = workbook.createCellStyle();
+        // 设置底边框;
+        style.setBorderBottom(BorderStyle.THIN);
+        // 设置底边框颜色;
+        style.setBottomBorderColor(IndexedColors.BLACK.index);
+        // 设置左边框;
+        style.setBorderLeft(BorderStyle.THIN);
+        // 设置左边框颜色;
+        style.setLeftBorderColor(IndexedColors.BLACK.index);
+        // 设置右边框;
+        style.setBorderRight(BorderStyle.THIN);
+        // 设置右边框颜色;
+        style.setRightBorderColor(IndexedColors.BLACK.index);
+        // 设置顶边框;
+        style.setBorderTop(BorderStyle.THIN);
+        // 设置顶边框颜色;
+        style.setTopBorderColor(IndexedColors.BLACK.index);
+        // 在样式用应用设置的字体;
+        style.setFont(font);
+        // 设置自动换行;
+        style.setWrapText(false);
+        // 设置水平对齐的样式为居中对齐;
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 设置垂直对齐的样式为居中对齐;
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        return style;
+    }
 }

src/main/java/com/caimei/modules/hehe/web/CmHeheProductController.java

@@ -8,6 +8,7 @@ import com.caimei.modules.hehe.entity.CmHeheFloor;
 import com.caimei.modules.hehe.service.CmHeheActivityService;
 import com.caimei.modules.hehe.service.CmHeheFloorService;
 import com.caimei.modules.product.entity.Product;
+import com.caimei.modules.product.service.ProductService;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,9 @@ public class CmHeheProductController extends BaseController {
     @Autowired
     private CmHeheActivityService cmHeheActivityService;
 
+    @Autowired
+    private ProductService productService;
+
     @ModelAttribute
     public CmHeheProduct get(@RequestParam(required = false) String id) {
         CmHeheProduct entity = null;
@@ -98,6 +102,9 @@ public class CmHeheProductController extends BaseController {
             });
         }
         model.addAttribute("activityList", activityList);
+        // 查询分类列表
+        Map<String, Object> classify = productService.findClassify(2);
+        model.addAttribute("classify", classify);
         return "modules/hehe/cmHeheProductForm";
     }
 

src/main/java/com/caimei/modules/hehe/web/HeHeNewOrderController.java

@@ -2,31 +2,37 @@ package com.caimei.modules.hehe.web;
 
 import com.caimei.modules.bulkpurchase.entity.BpClause;
 import com.caimei.modules.bulkpurchase.service.BpClauseService;
+import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.hehe.dao.CmHeheUserDao;
 import com.caimei.modules.hehe.entity.CmHeheUser;
 import com.caimei.modules.hehe.service.HeHeNewOrderService;
 import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.CmReceiptOrderRelationDao;
 import com.caimei.modules.order.dao.CmReturnedPurchaseDao;
+import com.caimei.modules.order.dao.NewOrderProductDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.CmDiscernReceiptService;
 import com.caimei.modules.order.service.CmReceiptOrderRelationService;
 import com.caimei.modules.order.service.CmReturnedPurchaseService;
 import com.caimei.modules.order.service.NewOrderConfigService;
+import com.caimei.modules.order.utils.OrderUtil;
+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 org.apache.commons.collections.CollectionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -59,6 +65,8 @@ public class HeHeNewOrderController extends BaseController {
     private CmDiscernReceiptDao cmDiscernReceiptDao;
     @Autowired
     private CmReceiptOrderRelationService cmReceiptOrderRelationService;
+    @Resource
+    private NewOrderProductDao newOrderProductDao;
 
     @ModelAttribute
     public NewOrder get(@RequestParam(required = false) String id) {
@@ -227,4 +235,66 @@ public class HeHeNewOrderController extends BaseController {
         model.addAttribute("returnedPurchaseFee", returnedPurchaseFee);
         return "modules/hehe/heheNewOrderDetail";
     }
-}
+
+    /**
+     * 取消订单
+     *
+     * @return
+     */
+    @RequestMapping("cancelOrder")
+    public String cancelOrder(Integer orderID, RedirectAttributes redirectAttributes) {
+        heHeNewOrderService.cancelOrder(orderID);
+        addMessage(redirectAttributes, "取消订单成功");
+        return "redirect:" + Global.getAdminPath() + "/hehe/new/order/detail/?id=" + orderID;
+    }
+
+    @RequestMapping(value = "batchExportOrder")
+    @ResponseBody
+    public String batchExportOrder(NewOrder order, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException {
+        //获取订单数据
+        String fileName = new String("呵呵订单.xls".getBytes("UTF-8"),"iso-8859-1");
+        // 表格数据
+        if (null != order.getStartTime() && !"".equals(order.getStartTime()) && !order.getStartTime().endsWith("00:00:00")) {
+            order.setStartTime(order.getStartTime() + " 00:00:00");
+        }
+        if (null != order.getEndTime() && !"".equals(order.getEndTime()) && !order.getEndTime().endsWith("23:59:59")) {
+            order.setEndTime(order.getEndTime() + " 23:59:59");
+        }
+        if (null != order.getStartConfirmTime() && !"".equals(order.getStartConfirmTime()) && !order.getStartConfirmTime().endsWith("00:00:00")) {
+            order.setStartConfirmTime(order.getStartConfirmTime() + " 00:00:00");
+        }
+        if (null != order.getEndConfirmTime() && !"".equals(order.getEndConfirmTime()) && !order.getEndConfirmTime().endsWith("23:59:59")) {
+            order.setEndConfirmTime(order.getEndConfirmTime() + " 23:59:59");
+        }
+        if (null != order.getStartRefundTime() && !"".equals(order.getStartRefundTime()) && !order.getStartRefundTime().endsWith("00:00:00")) {
+            order.setStartRefundTime(order.getStartRefundTime() + " 00:00:00");
+        }
+        if (null != order.getEndRefundTime() && !"".equals(order.getEndRefundTime()) && !order.getEndRefundTime().endsWith("23:59:59")) {
+            order.setEndRefundTime(order.getEndRefundTime() + " 23:59:59");
+        }
+        if (null != order.getBuyer()) {
+            order.setBuyer(order.getBuyer().trim());
+        }
+        if (null != order.getReceiver()) {
+            order.setReceiver(order.getReceiver().trim());
+        }
+        //查询内部处理了已收,未付统计（包含运费）
+        List<NewOrder> orderList = heHeNewOrderService.findList(order);
+        orderList.forEach(heheOrder->{
+            List<NewOrderProduct> productList = newOrderProductDao.findListByOrderID(heheOrder.getOrderID());
+            heheOrder.setNewOrderProducts(productList);
+        });
+        try {
+            OutputStream outputStream = response.getOutputStream();
+            response.reset();
+            response.setHeader("Content-disposition",
+                    "attachment; filename=" + fileName);
+            response.setContentType("application/vnd.ms-excel");
+            return heHeNewOrderService.batchExportOrder(orderList, outputStream);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "导出失败";
+        }
+
+    }
+}

src/main/java/com/caimei/modules/newhome/entity/NewPageFloorImage.java

@@ -32,6 +32,11 @@ public class NewPageFloorImage implements Serializable {
      */
     private Integer productId;
 
+    /**
+     * 供应商名称
+     */
+    private String shopName;
+
     /**
      * 名称
      */
@@ -77,6 +82,11 @@ public class NewPageFloorImage implements Serializable {
      */
     private String appletsStatus;
 
+    /**
+     * 推荐状态：0不推荐 1推荐
+     */
+    private String recommend;
+
     /**
      * 排序
      */
@@ -227,4 +237,20 @@ public class NewPageFloorImage implements Serializable {
     public void setDisplaySort(Integer displaySort) {
         this.displaySort = displaySort;
     }
+
+    public String getRecommend() {
+        return recommend;
+    }
+
+    public void setRecommend(String recommend) {
+        this.recommend = recommend;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.caimei.modules.newhome.web;
 
+import com.caimei.modules.hehe.entity.CmHeheProduct;
+import com.caimei.modules.hehe.service.CmHeheProductService;
 import com.caimei.modules.newhome.entity.NewPageFloor;
 import com.caimei.modules.newhome.entity.NewPageFloorContent;
 import com.caimei.modules.newhome.entity.NewPageFloorImage;
@@ -46,6 +48,9 @@ public class NewPageFloorController extends BaseController {
     @Autowired
     private ProductService productService;
 
+    @Autowired
+    private CmHeheProductService cmHeheProductService;
+
     @Autowired
     private RedisService redisService;
 
@@ -288,6 +293,18 @@ public class NewPageFloorController extends BaseController {
         }
     }
 
+    /**
+     * 呵呵商城首页楼层添加图片
+     */
+    @RequestMapping("/addHeheImage")
+    public String addHeheImage(Product product, Model model, HttpServletRequest request, HttpServletResponse response) {
+        Page<Product> page = cmHeheProductService.findHeheFloorProduct(new Page<Product>(request, response), product);
+        model.addAttribute("page", page);
+        model.addAttribute("productCategory", product.getProductCategory());
+        model.addAttribute("productIds", product.getProductIds());
+        return "modules/hehe/addHeheProductImage";
+    }
+
     /**
      * 添加其他图片
      */

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

@@ -221,8 +221,6 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     void updateOnlinePayFlag(@Param("onlinePayFlag") Integer onlinePayFlag,@Param("orderId") Integer orderId);
 
-    void updateBrokerage(@Param("shopOrderID")Integer shopOrderID ,@Param("brokerage")Double brokerage);
-
     Integer findSupport(Integer shopOrderId);
 
     List<OrderProductVo> getOrderProductByShopOrderId(Integer shopOrderId);

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

@@ -103,6 +103,4 @@ public interface NewOrderProductDao extends CrudDao<NewOrderProduct> {
      * @param shopOrderID
      */
     Integer countReturnedFreightProduct(Integer shopOrderID);
-
-
 }

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

@@ -82,7 +82,4 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
     Double findIncome(Integer orderID);
 
     List<NewShopOrder> findSplitList(NewShopOrder shopOrder);
-
-    //查询子订单是 线上 还是 线上
-    Integer payWay(Integer shopOrderID);
 }

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

@@ -144,14 +144,6 @@ public class ChangePayShopDifference implements Serializable {
      */
     private CmRefundShop refundShop;
 
-    /**
-     * 子订单收款状态  1待收款、2部分收款、3已收款
-     * @return
-     */
-    private  Integer shopReceiptStatus;
-
-
-
     public Integer getId() {
         return id;
     }
@@ -375,12 +367,4 @@ public class ChangePayShopDifference implements Serializable {
     public void setPayStatus(String payStatus) {
         this.payStatus = payStatus;
     }
-
-    public Integer getShopReceiptStatus() {
-        return shopReceiptStatus;
-    }
-
-    public void setShopReceiptStatus(Integer shopReceiptStatus) {
-        this.shopReceiptStatus = shopReceiptStatus;
-    }
 }

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

@@ -123,6 +123,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Double returnValue;  //退款总金额
     private Boolean returnedFreightFlag;//机构运费退货标识
     private String clubName;  //会所名称
+    private List<NewOrderProduct> newOrderProducts;  // 订单商品列表
 
     // 收款确认类型（1小额抹平确认，2大额抹平确认，3大额退款余额，4确认关联）
     private String confirmType;
@@ -1138,5 +1139,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setDiscountAmount(Double discountAmount) {
         this.discountAmount = discountAmount;
     }
+
+    public List<NewOrderProduct> getNewOrderProducts() {
+        return newOrderProducts;
+    }
+
+    public void setNewOrderProducts(List<NewOrderProduct> newOrderProducts) {
+        this.newOrderProducts = newOrderProducts;
+    }
 }
 

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

@@ -95,7 +95,6 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private BigDecimal differencePrice;  //补差价金额
     private Integer userBeans; //订单采美豆数量
     private Double svipShopReduction;   //超级会员优惠
-    private Integer payWay; //线上支付状态 1线上 2线下 3余额抵扣
     //-------------        虚拟字段   ----------------------------
     private Double income;       //主订单总佣金
     private List<String> shopOrderNos;      //主订单下所有子订单
@@ -153,15 +152,6 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
 
     private boolean payShopOtherFee = true; //是否可以付第三方申请
 
-
-    public Integer getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(Integer payWay) {
-        this.payWay = payWay;
-    }
-
     public Double getIncome() {
         return income;
     }

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

@@ -11,7 +11,6 @@ import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.NewCmShop;
 import com.caimei.utils.MathUtil;
 import com.caimei.utils.StringUtil;
-import com.opensymphony.module.sitemesh.html.CustomTag;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
@@ -266,21 +265,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 //主订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
-               //若成本下降太多导致部分收款的钱，已经大于成本重新计算佣金
-                if("0".equals(newOrder.getOnlinePayFlag()) && so.getShopReceiptStatus()==2){
-                    double mum= so.getProductAmount();
-                    System.out.println(so.getReceiptTotalFee());
-                    System.out.println(so.getShouldPayShopAmount());
-                    BigDecimal getShouldPayShopAmount = MathUtil.sub(so.getShouldPayShopAmount(), so.getDifferencePrice());
-                    if(so.getReceiptTotalFee()>Double.valueOf(getShouldPayShopAmount.toString())){
-                        //子订单佣金
-
-                        mum-= so.getShopOtherFee()+Double.valueOf(getShouldPayShopAmount.toString());
-                        so.setBrokerage(mum);
-                    }else { so.setBrokerage(null);}
-                }else { so.setBrokerage(null);}
-                //要是不大于成本默认显示
-
             }
             cmPayShop.setTotalAmount(totalAmount);
             cmPayShop.setBalancePayFee(0D);
@@ -368,7 +352,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
             }
-
             cmPayShop.setShopOrders(csos);
         }
     }
@@ -946,7 +929,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
             payShopDifference.setRebateAmount(BigDecimal.valueOf(rebateAmount));
             payShopDifference.setType(shopOrder.getDifferenceType());
             payShopDifference.setDifferencePrice(shopOrder.getDifferencePrice());
-            payShopDifference.setShopReceiptStatus( shopOrder.getShopReceiptStatus());
         }
         payShopDifference.setWaitPayShop(waitPayShop);
         return payShopDifference;
@@ -1093,9 +1075,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         if (!("3".equals(shopOrder.getPayStatus()) && 1 == payShopDifference.getType())) {
             newShopOrderDao.updateByDifferencePrice(payShopDifference.getType(), differencePrice, shopOrderId);
         }
-
-
-
     }
 
     public ChangePayShopOther shopOtherApplyEdit(Integer payShopId) {

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

@@ -668,8 +668,4 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         page.setList(payOrderList);
         return page;
     }
-
-    public Integer payWay(Integer shoprderID){
-        return newShopOrderDao.payWay(shoprderID);
-    }
 }

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

@@ -4,7 +4,6 @@ import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.common.utils.UploadUtils;
 import com.caimei.modules.order.dao.CmPayShopRecordDao;
-import com.caimei.modules.order.dao.NewOrderDao;
 import com.caimei.modules.order.dao.NewOrderProductDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
@@ -68,8 +67,6 @@ public class CmPayShopController extends BaseController {
     private CmPayShopRecordDao cmPayShopRecordDao;
     @Resource
     private NewOrderProductDao newOrderProductDao;
-    @Resource
-    private NewOrderDao newOrderDao;
 
     @ModelAttribute
     public CmPayShop get(@RequestParam(required = false) String id) {
@@ -388,9 +385,8 @@ public class CmPayShopController extends BaseController {
         shopOrder.setPayStatus(soZeroCostFlag ? "3" : "1");
         shopOrder.setZeroCostFlag(soZeroCostFlag ? 1 : 0);
         //当子订单0成本时，若主订单中其他子订单(除了运费子订单)都为0成本，设主订单为已付款，否则设为部分付款
-         NewOrder newOrder = newOrderService.get(shopOrder.getOrderID().toString());
         if (soZeroCostFlag) {
-
+            NewOrder newOrder = newOrderService.get(shopOrder.getOrderID().toString());
             AtomicReference<Boolean> zeroCostFlag = new AtomicReference<>(true);
             AtomicReference<Boolean> freightFlag = new AtomicReference<>(false);
 
@@ -422,45 +418,19 @@ public class CmPayShopController extends BaseController {
             }
             newOrderService.updatePayStatus(newOrder);
         }
-
-
-
         shopOrder.setShopPostFee(freight); //运费
         shopOrder.setShopOtherFee(thirdPartyFee); //付第三方
         shopOrder.setCostType(costType);
         shopOrder.setModifyShouldPayNote(modifyShouldPayNote);  //备注
         shopOrder.setModifyShouldPayUserID(UserUtils.getUser().getId());  //修改人的用户id
         shopOrder.setModifyShouldPayDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));  //修改时间
+
         double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getShopPostFee() + shopOrder.getShopTaxFee();
         if (shopOrder.getPayedShopAmount() != null && shouldPayShopAmount == shopOrder.getPayedShopAmount())
             shopOrder.setPayStatus("3");
         shopOrder.setShouldPayShopAmount(shouldPayShopAmount);
         newShopOrderService.modifyPayShopAmount(shopOrder, orderProducts);
 
-        if(shopOrder.getShopReceiptStatus()==1){
-            System.out.println(shopOrder.getShopReceiptStatus());
-            logger.info("未付款子订单进了成本修改"+shopOrder.getShouldPayShopAmount()+"-----"+shopOrder.getShopOtherFee());
-            double mum= newShopOrder.getProductAmount();
-            mum-= shopOrder.getShopOtherFee()+shopOrder.getShouldPayShopAmount();   //因为成本上升,子订单佣金下降。当成本上升到子订单佣金不大于线上支付最大手续费时不能进行线上支付所以减了第三方
-            System.out.println(">>>>>>>>子订单佣金"+mum+"----"+shopOrder.getBrokerage());
-            double fee=0.0;
-            if(shopOrder.getShopOtherFee()>=1000.01){
-                //手续费 =子订单金额*默认代理费率
-                 fee=shopOrder.getProductAmount()*0.0065;
-                if(mum<fee){
-                    newOrderDao.updateOnlinePayFlag(1,shopOrder.getOrderID());
-                }
-            }else if(shopOrder.getShopOtherFee()<=1000.01){
-                 fee=shopOrder.getProductAmount()*0.0025;
-                if(mum<fee){
-                    newOrderDao.updateOnlinePayFlag(1,shopOrder.getOrderID());
-                }
-            }
-            if(mum>fee){
-                newOrderDao.updateOnlinePayFlag(0,shopOrder.getOrderID());
-            }
-        }
-
         return "redirect:" + Global.getAdminPath() + "/shopOrder/payOrderList";
     }
 

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

@@ -7,7 +7,6 @@ import com.caimei.modules.order.service.CmChangePayShopRecondService;
 import com.caimei.modules.order.service.NewShopOrderService;
 import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
-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;
@@ -73,13 +72,11 @@ public class CmShopOrderController extends BaseController {
             newShopOrder.setEndTime(newShopOrder.getEndTime().trim() + " 23:59:59");
         }
         Page<NewShopOrder> page = newShopOrderService.findPayOrderList(new Page<>(request, response), newShopOrder);
-
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
         model.addAttribute("page", page);
         model.addAttribute("operatingMode", newShopOrder.getOperatingMode());
-
         if ("3".equals(newShopOrder.getOperatingMode())) {
             //已付款子订单页面
             return "modules/order/paidShopOrderList";
@@ -112,7 +109,6 @@ public class CmShopOrderController extends BaseController {
     public String SplitAccount(NewShopOrder newShopOrder, HttpServletRequest request, HttpServletResponse response, Model model){
         //1. 展示付款状态为待付款和部分付款状态的线上支付的子订单；
         //2. 子订单按下单时间降序排列
-        //3. 手动分账页面需要只控制显示已收款的子订单
         Page<NewShopOrder> page = newShopOrderService.findSplitList(new Page<>(request, response),newShopOrder);
         model.addAttribute("page", page);
         return "modules/order/cmSplitAccountList";

src/main/java/com/caimei/modules/product/entity/CmBigtype.java

@@ -15,6 +15,7 @@ public class CmBigtype extends  DataEntity<CmBigtype> {
 	private static final long serialVersionUID = 1L;
 	private String bigTypeID;		// bigTypeID
     private String typeSort;       // 分类类型，1产品，2仪器
+	private Integer mallType;		// 商城类型：1采美商城，2呵呵商城
 	private String name;		// name
 	private String bigTypeCode; //大分类编码
 	private String wwwValidFlag;		// www启用标识，0停用，1启用
@@ -40,7 +41,6 @@ public class CmBigtype extends  DataEntity<CmBigtype> {
 		this.bigTypeID = bigTypeID;
 	}
 	
-	@Length(min=0, max=10, message="name长度必须介于 0 和 10 之间")
 	public String getName() {
 		return name;
 	}
@@ -114,4 +114,12 @@ public class CmBigtype extends  DataEntity<CmBigtype> {
     public void setCrmIcon(String crmIcon) {
         this.crmIcon = crmIcon;
     }
+
+	public Integer getMallType() {
+		return mallType;
+	}
+
+	public void setMallType(Integer mallType) {
+		this.mallType = mallType;
+	}
 }

src/main/java/com/caimei/modules/product/entity/CmSmalltype.java

@@ -15,6 +15,7 @@ public class CmSmalltype extends DataEntity<CmSmalltype> {
 	private static final long serialVersionUID = 1L;
 	private String smallTypeID;		// smallTypeID
 	private String bigTypeID;		// 一级分类Id
+	private Integer mallType;		// 商城类型：1采美商城，2呵呵商城
 	private String name;		// 名称
 	private String smallTypeCode; //小分类编码
 	private String wwwValidFlag;		// www启用标识，0停用，1启用
@@ -52,7 +53,6 @@ public class CmSmalltype extends DataEntity<CmSmalltype> {
 		this.bigTypeID = bigTypeID;
 	}
 	
-	@Length(min=0, max=10, message="名称长度必须介于 0 和 10 之间")
 	public String getName() {
 		return name;
 	}
@@ -126,4 +126,12 @@ public class CmSmalltype extends DataEntity<CmSmalltype> {
 	public void setTypeSort(String typeSort) {
 		this.typeSort = typeSort;
 	}
+
+	public Integer getMallType() {
+		return mallType;
+	}
+
+	public void setMallType(Integer mallType) {
+		this.mallType = mallType;
+	}
 }

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -352,9 +352,11 @@ public class ProductService extends CrudService<ProductDao, Product> {
         return cmBrandDao.getList();
     }
 
-    public Map<String, Object> findClassify() {
+    public Map<String, Object> findClassify(Integer mallType) {
         Map<String, Object> classifyMap = new HashMap<>();
-        List<CmBigtype> bigTypeList = cmBigtypeDao.findList(new CmBigtype());
+        CmBigtype bigtype = new CmBigtype();
+        bigtype.setMallType(mallType);
+        List<CmBigtype> bigTypeList = cmBigtypeDao.findList(bigtype);
         List<CmSmalltype> smalltypeList = cmSmalltypeDao.findList(new CmSmalltype());
         List<CmTinytype> tinytypeList = cmTinytypeDao.findList(new CmTinytype());
         classifyMap.put("bigTypeList", bigTypeList);

src/main/java/com/caimei/modules/product/web/CmBigtypeController.java

@@ -61,14 +61,19 @@ public class CmBigtypeController extends BaseController {
 	@RequiresPermissions("product:cmBigtype:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(CmBigtype cmBigtype, HttpServletRequest request, HttpServletResponse response, Model model) {
+		cmBigtype.setMallType(null == cmBigtype.getMallType() ? 1 : cmBigtype.getMallType());
 		Page<CmBigtype> page = cmBigtypeService.findPage(new Page<CmBigtype>(request, response), cmBigtype);
 		model.addAttribute("page", page);
-		if ("1".equals(cmBigtype.getTypeSort())) {
-			return "modules/product/cmProductBigtypeList";
-		} else if ("2".equals(cmBigtype.getTypeSort())) {
-			return "modules/product/cmInstrumentBigtypeList";
-		} else {
-			return "modules/product/cmProductBigtypeList";
+		if (2 == cmBigtype.getMallType()) {
+			return "modules/hehe/cmHeheBigtypeList";
+		}else {
+			if ("1".equals(cmBigtype.getTypeSort())) {
+				return "modules/product/cmProductBigtypeList";
+			} else if ("2".equals(cmBigtype.getTypeSort())) {
+				return "modules/product/cmInstrumentBigtypeList";
+			} else {
+				return "modules/product/cmProductBigtypeList";
+			}
 		}
 	}
 
@@ -78,26 +83,35 @@ public class CmBigtypeController extends BaseController {
 		if(null == cmBigtype.getSortIndex()){
 			cmBigtype.setSortIndex(1);
 		}
+		cmBigtype.setMallType(null == cmBigtype.getMallType() ? 1 : cmBigtype.getMallType());
 		model.addAttribute("cmBigtype", cmBigtype);
-		return "modules/product/cmBigtypeForm";
+		if (2 == cmBigtype.getMallType()) {
+			return "modules/hehe/cmHeheBigtypeForm";
+		} else {
+			return "modules/product/cmBigtypeForm";
+		}
 	}
 
 	@RequiresPermissions("product:cmBigtype:edit")
 	@RequestMapping(value = "save")
 	public String save(CmBigtype cmBigtype, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request) {
+		cmBigtype.setMallType(null == cmBigtype.getMallType() ? 1 : cmBigtype.getMallType());
 		if (checkValidator(model, cmBigtype)){
 			return form(cmBigtype, model);
 		}
 		if (null!=cmBigtype && cmBigtype.getAddTime() == null){
 			cmBigtype.setAddTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 		}
+		if ("0".equals(cmBigtype.getTypeSort())) {
+			cmBigtype.setTypeSort(null);
+		}
 		cmBigtypeService.save(cmBigtype);
 		cleanRedisCache();
 //		if (flag){
 //			cmBigtypeService.mutiUpdateCode(cmBigtype.getBigTypeID());
 //		}
 		addMessage(redirectAttributes, "保存一级分类成功");
-		return "redirect:"+Global.getAdminPath()+"/product/cmBigtype/?repage&typeSort="+cmBigtype.getTypeSort();
+		return "redirect:" + Global.getAdminPath() + "/product/cmBigtype/?repage&typeSort=" + cmBigtype.getTypeSort() + "&mallType=" + cmBigtype.getMallType();
 	}
 
 	private boolean checkValidator(Model model, CmBigtype cmBigtype) {
@@ -108,34 +122,38 @@ public class CmBigtypeController extends BaseController {
 			model.addAttribute("errorMsg", "请输入分类名称！");
 			return true;
 		}
-		if(StringUtils.getStringLength(cmBigtype.getName())>16){
+		if(1 == cmBigtype.getMallType() && StringUtils.getStringLength(cmBigtype.getName())>16){
 			model.addAttribute("errorMsg", "名称过长！");
 			return true;
 		}
-		if (StringUtils.isEmpty(cmBigtype.getBigTypeCode())) {
+		if (1 == cmBigtype.getMallType() && StringUtils.isEmpty(cmBigtype.getBigTypeCode())) {
 			model.addAttribute("errorMsg", "请输入编码！");
 			return true;
 		}
-		if (null!=cmBigtype&&cmBigtype.getBigTypeID()==null&&cmBigtypeService.getByCode(cmBigtype.getBigTypeCode())!=null){
+		if (1 == cmBigtype.getMallType() && cmBigtype.getBigTypeID()==null&&cmBigtypeService.getByCode(cmBigtype.getBigTypeCode())!=null){
 			model.addAttribute("errorMsg", "大分类编码不能相同！");
 			return true;
 		}
-		if (StringUtils.isEmpty(cmBigtype.getWwwIcon())) {
+		if (1 == cmBigtype.getMallType() && StringUtils.isEmpty(cmBigtype.getWwwIcon())) {
 			model.addAttribute("errorMsg", "请上传网站图标！");
 			return true;
 		}
-		if (StringUtils.isEmpty(cmBigtype.getCrmIcon())) {
+		if (1 == cmBigtype.getMallType() && StringUtils.isEmpty(cmBigtype.getCrmIcon())) {
 			model.addAttribute("errorMsg", "请上传小程序图标！");
 			return true;
 		}
-		if (StringUtils.isEmpty(cmBigtype.getTypeSort())) {
+		if (null ==cmBigtype.getSortIndex()) {
 			model.addAttribute("errorMsg", "请输入排序值！");
 			return true;
 		}
-		if (Integer.parseInt(cmBigtype.getTypeSort()) <= 0) {
+		if (cmBigtype.getSortIndex() <= 0) {
 			model.addAttribute("errorMsg", "排序值只能输入大于0的正整数！");
 			return true;
 		}
+		if (1 == cmBigtype.getMallType() && StringUtils.isEmpty(cmBigtype.getTypeSort()) ) {
+			model.addAttribute("errorMsg", "请输入分类类型！");
+			return true;
+		}
 		return false;
 	}
 
@@ -180,13 +198,13 @@ public class CmBigtypeController extends BaseController {
 	 * @param redirectAttributes
 	 * @return
 	 */
-	@RequiresPermissions("product:cmBigtype:delete")
 	@RequestMapping(value = "delete")
 	public String delete(CmBigtype cmBigtype, RedirectAttributes redirectAttributes) {
+		cmBigtype.setMallType(null == cmBigtype.getMallType() ? 1 : cmBigtype.getMallType());
 		cmBigtypeService.delete(cmBigtype);
 		cleanRedisCache();
 		addMessage(redirectAttributes, "删除大分类成功");
-		return "redirect:"+Global.getAdminPath()+"/product/cmBigtype/?repage";
+		return "redirect:" + Global.getAdminPath() + "/product/cmBigtype/?repage&mallType=" + cmBigtype.getMallType();
 	}
 
 	/**
@@ -207,7 +225,7 @@ public class CmBigtypeController extends BaseController {
 	@RequiresPermissions("product:cmBigtype:edit")
 	@RequestMapping(value = "updateSortIndex")
 	@ResponseBody
-	public JsonModel updateSortIndex(String bigTypeIdSortIndexs){
+	public JsonModel updateSortIndex(String bigTypeIdSortIndexs,Integer mallType){
 		JsonModel jsonModel = JsonModel.newInstance();
 		cmBigtypeService.updateSortIndex(bigTypeIdSortIndexs);
 		cleanRedisCache();

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -193,7 +193,6 @@ public class CmSecondHandDetailController extends BaseController {
         model.addAttribute("cmSecondHandDetail", cmSecondHandDetail);
         return "modules/product/cmSecondHandDetailForm";
     }
-//   http://192.168.2.101/api/2022%E5%B9%B4/2022%E5%B9%B4%E5%B0%8F%E9%9C%80%E6%B1%82
 
     @RequiresPermissions("product:cmSecondHandDetail:edit")
     @RequestMapping(value = "save")

src/main/java/com/caimei/modules/product/web/CmSmalltypeController.java

@@ -65,29 +65,40 @@ public class CmSmalltypeController extends BaseController {
 	@RequiresPermissions("product:cmSmalltype:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(CmSmalltype cmSmalltype, HttpServletRequest request, HttpServletResponse response, Model model) {
+		cmSmalltype.setMallType(null == cmSmalltype.getMallType() ? 1 : cmSmalltype.getMallType());
 		Page<CmSmalltype> page = cmSmalltypeService.findPage(new Page<CmSmalltype>(request, response), cmSmalltype);
 		model.addAttribute("page", page);
 		CmBigtype cmBigtype = cmBigtypeService.get(cmSmalltype.getBigTypeID());
 		model.addAttribute("bigTypeID", cmSmalltype.getBigTypeID());
 		model.addAttribute("bigTypeName", cmBigtype.getName());
 		model.addAttribute("typeSort", cmSmalltype.getTypeSort());
-		return "modules/product/cmSmalltypeList";
+		if (2 == cmSmalltype.getMallType()) {
+			return "modules/hehe/cmHeheSmalltypeList";
+		} else {
+			return "modules/product/cmSmalltypeList";
+		}
 	}
 
 	@RequiresPermissions("product:cmSmalltype:view")
 	@RequestMapping(value = "form")
 	public String form(CmSmalltype cmSmalltype, Model model) {
+ 		cmSmalltype.setMallType(null == cmSmalltype.getMallType() ? 1 : cmSmalltype.getMallType());
 		if(null == cmSmalltype.getSortIndex()){
 			cmSmalltype.setSortIndex(1);
 		}
 		model.addAttribute("cmSmalltype", cmSmalltype);
 		model.addAttribute("bigTypeID", cmSmalltype.getBigTypeID());
-		return "modules/product/cmSmalltypeForm";
+		if (2 == cmSmalltype.getMallType()) {
+			return "modules/hehe/cmHeheSmalltypeForm";
+		} else {
+			return "modules/product/cmSmalltypeForm";
+		}
 	}
 
 	@RequiresPermissions("product:cmSmalltype:edit")
 	@RequestMapping(value = "save")
 	public String save(CmSmalltype cmSmalltype, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) {
+		cmSmalltype.setMallType(null == cmSmalltype.getMallType() ? 1 : cmSmalltype.getMallType());
 		if (checkValidator(model, cmSmalltype)){
 			return form(cmSmalltype, model);
 		}
@@ -100,35 +111,41 @@ public class CmSmalltypeController extends BaseController {
 //			cmSmalltypeService.mutiUpdateCode(cmSmalltype.getSmallTypeID());
 //		}
 		addMessage(redirectAttributes, "保存二级分类成功");
-		return "redirect:"+Global.getAdminPath()+"/product/cmSmalltype/?repage&bigTypeID="+cmSmalltype.getBigTypeID()+"&typeSort="+cmSmalltype.getTypeSort();
+		return "redirect:" + Global.getAdminPath() + "/product/cmSmalltype/?repage&bigTypeID=" + cmSmalltype.getBigTypeID() + "&typeSort=" + cmSmalltype.getTypeSort() + "&mallType=" + cmSmalltype.getMallType();
 	}
 
 	private boolean checkValidator(Model model, CmSmalltype cmSmalltype) {
 		if (!beanValidator(model, cmSmalltype)){
 			return true;
 		}
-		if(StringUtils.getStringLength(cmSmalltype.getName())>16){
+		if(1 == cmSmalltype.getMallType() && StringUtils.getStringLength(cmSmalltype.getName())>16){
 			model.addAttribute("errorMsg", "名称过长！");
 			return true;
 		}
-		List<CmSmalltype> cmSmalltypeList =  cmSmalltypeService.getByCode(cmSmalltype.getSmallTypeCode(),cmSmalltype.getBigTypeID());
-		if (null!=cmSmalltype&&cmSmalltype.getSmallTypeID()==null&&cmSmalltypeList!=null&&cmSmalltypeList.size()>0){
-			model.addAttribute("errorMsg", "同一大分类下小分类编码不能相同！");
-			return true;
+		if (1 == cmSmalltype.getMallType()) {
+			List<CmSmalltype> cmSmalltypeList =  cmSmalltypeService.getByCode(cmSmalltype.getSmallTypeCode(),cmSmalltype.getBigTypeID());
+			if (cmSmalltype.getSmallTypeID()==null&&cmSmalltypeList!=null&&cmSmalltypeList.size()>0){
+				model.addAttribute("errorMsg", "同一大分类下小分类编码不能相同！");
+				return true;
+			}
+			if (StringUtils.isEmpty(cmSmalltype.getWwwIcon())) {
+				model.addAttribute("errorMsg", "请上传网站图标！");
+				return true;
+			}
+			if (StringUtils.isEmpty(cmSmalltype.getTypeSort())) {
+				model.addAttribute("errorMsg", "请输入分类类型！");
+				return true;
+			}
 		}
-        if (StringUtils.isEmpty(cmSmalltype.getWwwIcon())) {
-            model.addAttribute("errorMsg", "请上传网站图标！");
-            return true;
-        }
         if (StringUtils.isEmpty(cmSmalltype.getCrmIcon())) {
             model.addAttribute("errorMsg", "请上传小程序图标！");
             return true;
         }
-        if (StringUtils.isEmpty(cmSmalltype.getTypeSort())) {
-            model.addAttribute("errorMsg", "请输入排序值！");
-            return true;
-        }
-		if (Integer.parseInt(cmSmalltype.getTypeSort()) <= 0) {
+		if (null ==cmSmalltype.getSortIndex()) {
+			model.addAttribute("errorMsg", "请输入排序值！");
+			return true;
+		}
+		if (cmSmalltype.getSortIndex() <= 0) {
 			model.addAttribute("errorMsg", "排序值只能输入大于0的正整数！");
 			return true;
 		}
@@ -175,13 +192,12 @@ public class CmSmalltypeController extends BaseController {
 	 * @param redirectAttributes
 	 * @return
 	 */
-	@RequiresPermissions("product:cmSmalltype:delete")
 	@RequestMapping(value = "delete")
 	public String delete(CmSmalltype cmSmalltype, RedirectAttributes redirectAttributes) {
 		cmSmalltypeService.delete(cmSmalltype);
 		cleanRedisCache();
 		addMessage(redirectAttributes, "删除小分类成功");
-		return "redirect:"+Global.getAdminPath()+"/product/cmSmalltype/?repage&bigTypeID="+cmSmalltype.getBigTypeID();
+		return "redirect:" + Global.getAdminPath() + "/product/cmSmalltype/?repage&bigTypeID=" + cmSmalltype.getBigTypeID() + "&mallType=" + cmSmalltype.getMallType();
 	}
 
 	/**
@@ -219,7 +235,7 @@ public class CmSmalltypeController extends BaseController {
 	@RequiresPermissions("product:cmBigtype:edit")
 	@RequestMapping(value = "updateSortIndex")
 	@ResponseBody
-	public JsonModel updateSortIndex(String smallTypeIdSortIndexs){
+	public JsonModel updateSortIndex(String smallTypeIdSortIndexs,Integer mallType){
 		JsonModel jsonModel = JsonModel.newInstance();
 		cmSmalltypeService.updateSortIndex(smallTypeIdSortIndexs);
 		cleanRedisCache();

src/main/java/com/caimei/modules/product/web/ProductController.java

@@ -336,7 +336,7 @@ public class ProductController extends BaseController{
             product.setLadderPriceList(ladderPriceList);
         }
         List<CmBrand> brandList = productService.findBrandList();
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         List<Province> provinceList = areaService.loadProvince();
         model.addAttribute("brandList", brandList);
         model.addAttribute("classify", classify);

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -219,7 +219,7 @@ public class ProductNewController extends BaseController {
             }
         }
         List<CmBrand> brandList = productService.findBrandList();
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         model.addAttribute("brandList", brandList);
         model.addAttribute("classify", classify);
         model.addAttribute("page", page);
@@ -323,7 +323,7 @@ public class ProductNewController extends BaseController {
         product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
         List<CmBrand> brandList = productService.findBrandList();
         List<CmShop> shopList = productService.findSepcialShopList();
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         List<Province> provinceList = areaService.loadProvince();
         List<CmProductCombination> combinationList = cmProductCombinationService.findProductCombinationList();
 
@@ -574,7 +574,7 @@ public class ProductNewController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/product/new/list/";
         }
         product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         model.addAttribute("classify", classify);
         model.addAttribute("product", product);
         return "modules/product-new/fastEdit";
@@ -591,7 +591,7 @@ public class ProductNewController extends BaseController {
         }
         model.addAttribute("product", product);
 
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         model.addAttribute("classify", classify);
 
         List<ProductCustomClassification> customClassify = productService.getProductTypes(product.getProductID());
@@ -1006,7 +1006,7 @@ public class ProductNewController extends BaseController {
         } else {
             model.addAttribute("recommendType", recommendType);
         }
-        Map<String, Object> classify = productService.findClassify();
+        Map<String, Object> classify = productService.findClassify(1);
         model.addAttribute("classify", classify);
         model.addAttribute("product", product);
         model.addAttribute("recommendList", recommendList);

src/main/resources/config/dev/caimei.properties

@@ -15,9 +15,6 @@ jdbc.driver=com.mysql.cj.jdbc.Driver
 jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 jdbc.username=developer
 jdbc.password=05bZ/OxTB:X+yd%1
-#jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-#jdbc.username=developer
-#jdbc.password=J5p3tgOVazNl4ydf
 
 #jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
 #jdbc.username=developer
@@ -47,10 +44,6 @@ redis.keyPrefix=caimei-manager
 redis.host=192.168.2.100
 redis.port=6379
 redis.pass=123456
-#redis.host=47.119.112.46
-#redis.port=6379
-#redis.pass=6#xsI%b4o@5c3RoE
-
 redis.timeout=100000
 #\u6700\u5927\u8FDE\u63A5\u6570
 redis.pool.maxActive=300

src/main/resources/config/dev/dfs_client.conf

@@ -11,8 +11,8 @@ base_path=/home/yuqing/fastdfs
 
 # tracker_server can ocur more than once, and tracker_server format is
 #  "host:port", host can be hostname or ip address
-# tracker_server=192.168.2.100:22122
-tracker_server=172.31.165.28:22122
+tracker_server=192.168.2.100:22122
+# tracker_server=172.31.165.28:22122
 
 #standard log level as syslog, case insensitive, value list:
 ### emerg for emergency

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -189,15 +189,22 @@
 		  a.`label`,
 		  a.pcStatus,
 		  a.appletsStatus,
+		  a.recommend,
 		  a.sort,
 		  a.displaySort,
 		  DATE_FORMAT(a.createDate, '%Y-%m-%d %H:%i:%S') AS createDate,
-		  p.validFlag
+		  p.validFlag,
+		  s.name as shopName
 		FROM
 		  new_page_floor_image a
 		  LEFT JOIN product p ON a.productId = p.productID
+		  LEFT JOIN shop s on p.shopID = s.shopID
+		  left join cm_hehe_product chp on a.productId = chp.productId
 		WHERE
 		  a.centreId = #{centreId}
+          <if test="type != null and type == '8'">
+              and chp.id is not null
+          </if>
 	</select>
 
 	<select id="findPageTitle" resultType="java.lang.String">

src/main/resources/mappings/modules/hehe/CmHeheActivityProductMapper.xml

@@ -37,6 +37,7 @@
 		<where>
 			a.delFlag = 0
 			AND a.activityId = #{activityId}
+			and chp.id is not null
 			<if test="name != null and name != ''">
 				AND p.name LIKE CONCAT('%',#{name},'%')
 			</if>
@@ -100,17 +101,6 @@
 		update cm_hehe_activity_product set productId = #{newProductId} where productId = #{oldProductId}
 	</update>
 
-    <select id="findActivityProductId" resultType="integer">
-		SELECT
-		  productId
-		FROM
-		  cm_hehe_activity_product a
-		  LEFT JOIN cm_hehe_activity cha ON a.activityId = cha.id
-		WHERE
-		  a.delFlag = 0
-		  AND cha.delFlag = 0
-	</select>
-
 	<select id="findAllHeHeProduct" resultType="com.caimei.modules.hehe.entity.CmHeheProduct">
 		SELECT
 		a.id AS "id",
@@ -182,11 +172,8 @@
 	<select id="findActivityByProductId" resultType="integer">
 		SELECT activityId FROM cm_hehe_activity_product WHERE productId = #{productId} AND delFlag = 0
 	</select>
-    <select id="findCollageProductId" resultType="java.lang.Integer">
-		select chcp.productId from cm_hehe_collage_product chcp
-	</select>
 
-    <delete id="deleteUserActivity">
+	<delete id="deleteUserActivity">
 		DELETE FROM cm_hehe_user_activity WHERE productId = #{productId}
 	</delete>
 

src/main/resources/mappings/modules/hehe/CmHeheCollageProductMapper.xml

@@ -18,7 +18,7 @@
 	
 	<sql id="cmHeheCollageProductJoins">
 		left join product p on a.productId = p.productID
-		left join cm_hehe_product hp on p.productID = hp.productId
+		left join cm_hehe_product chp on p.productID = chp.productId
 		left join shop s on p.shopID = s.shopID
 	</sql>
     
@@ -36,6 +36,7 @@
 		FROM cm_hehe_collage_product a
 		<include refid="cmHeheCollageProductJoins"/>
 		<where>
+			chp.id is not null
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
@@ -75,16 +76,6 @@
 			</otherwise>
 		</choose>
 	</select>
-	<select id="findExistProductIds" resultType="java.lang.Integer">
-		select chp.id from cm_hehe_collage_product chcp left join cm_hehe_product chp on chcp.productId = chp.productId
-		where chp.id is not null;
-	</select>
-	<select id="findActivityProductIds" resultType="java.lang.Integer">
-		select chp.id
-		from cm_hehe_activity_product chap
-				 left join cm_hehe_product chp on chap.productId = chp.productId
-		where chp.id is not null and delFlag = 0;
-	</select>
 	<select id="findReductionProductIds" resultType="java.lang.Integer">
 		select chp.id
 		from cm_hehe_reduction chap

src/main/resources/mappings/modules/hehe/CmHeheImageMapper.xml

@@ -6,6 +6,7 @@
 		a.id AS "id",
 		a.topic AS "topic",
 		a.image AS "image",
+		a.link,
 		a.sort AS "sort",
 		a.status AS "status",
 		a.addTime AS "addTime"
@@ -70,12 +71,14 @@
 		INSERT INTO cm_hehe_image(
 			topic,
 			image,
+		    link,
 			sort,
 			status,
 			addTime
 		) VALUES (
 			#{topic},
 			#{image},
+			#{link},
 			#{sort},
 			#{status},
 			NOW()
@@ -86,6 +89,7 @@
 		UPDATE cm_hehe_image SET 	
 			topic = #{topic},
 			image = #{image},
+			link = #{link},
 			sort = #{sort},
 			status = #{status},
 			addTime = #{addTime}

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -5,6 +5,8 @@
 	<sql id="cmHeheProductColumns">
 		a.id AS "id",
 		a.productId AS "productId",
+		ifnull(a.bigTypeId,0) AS "bigTypeId",
+		ifnull(a.smallTypeId,0) AS "smallTypeId",
 		a.validFlag AS "validFlag",
 		a.price AS "price",
 		a.includedTax AS "includedTax",
@@ -98,6 +100,8 @@
 	<insert id="insert" parameterType="CmHeheProduct"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_hehe_product(
 			productId,
+			bigTypeId,
+			smallTypeId,
 			validFlag,
 			price,
 			includedTax,
@@ -107,6 +111,8 @@
 			addTime
 		) VALUES (
 			#{productId},
+			#{bigTypeId},
+			#{smallTypeId},
 			#{validFlag},
 			#{price},
 			#{includedTax},
@@ -128,6 +134,8 @@
 	<update id="update">
 		UPDATE cm_hehe_product SET 	
 			productId = #{productId},
+		    bigTypeId = #{bigTypeId},
+			smallTypeId = #{smallTypeId},
 			validFlag = #{validFlag},
 			price = #{price},
 			includedTax = #{includedTax},
@@ -218,6 +226,60 @@
 		select productId from cm_hehe_product where oldProductId = #{oldProductId}
 	</select>
 
+	<select id="findHeHeFloorProductIds" resultType="java.lang.Integer">
+		select i.productId from new_page_floor_image i left join cm_page_centre c on i.centreId = c.id
+		left join cm_page p on c.pageId = p.id
+		where p.type = 8
+	</select>
+	<select id="findAllHeheProduct" resultType="com.caimei.modules.product.entity.Product">
+		SELECT
+			a.*,s.name AS "shopName"
+		FROM cm_hehe_product chp left join product a on chp.productId = a.productID
+				 LEFT JOIN shop s on s.shopID = a.shopID
+		<where>
+		    chp.validFlag = 1
+			<if test="productID != null" >
+				AND a.productID = #{productID}
+			</if>
+			<if test="name != null and name != ''">
+				AND a.name LIKE concat('%',#{name},'%')
+			</if>
+			<if test="shopName != null and shopName != ''">
+				AND s.name LIKE concat('%',#{shopName},'%')
+			</if>
+			<if test="ids != null and ids.size() > 0 ">
+				AND a.productID NOT IN
+				<foreach collection="ids" open="(" close=")" item="id" separator=",">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by a.productID
+			</otherwise>
+		</choose>
+	</select>
+	<select id="findActivityProductIds" resultType="java.lang.Integer">
+		SELECT
+			a.productId
+		FROM
+			cm_hehe_activity_product a
+			LEFT JOIN cm_hehe_activity cha ON a.activityId = cha.id
+		WHERE
+			a.delFlag = 0
+		  AND cha.delFlag = 0
+  	</select>
+	<select id="findCollageProductIds" resultType="java.lang.Integer">
+		select productId from cm_hehe_collage_product
+	</select>
+	<select id="findDiscountProductIds" resultType="java.lang.Integer">
+		select productId from hehe_discount_activity_product hdap left join cm_hehe_discount_activity chda on hdap.activityId = chda.id
+		where chda.id is not null
+	</select>
 
 	<update id="deleteActivityProduct">
 		UPDATE cm_hehe_activity_product SET delFlag = 1 WHERE productId = #{productId}

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -59,6 +59,9 @@
         if(chcm.id is not null,1,0) as collageFlag,
         chc.status as collageStatus
 	</sql>
+    <update id="cancleOrder">
+        update cm_order set status = 6 where orderID = #{orderID}
+    </update>
 
     <select id="get" resultType="newOrder">
         SELECT <include refid="columns"/>

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

@@ -229,13 +229,13 @@
 	<insert id="insertFloorImage">
 		INSERT INTO `new_page_floor_image` (
 		  `floorId`, `productId`, `name`, `link`,
-		  `image`,`appletsImage`, `adsImage`, `label`, `content`, `pcStatus`, `appletsStatus`,
+		  `image`,`appletsImage`, `adsImage`, `label`, `content`, `pcStatus`, `appletsStatus`, `recommend`,
 		  `sort`, `createDate`, centreId, displaySort
 		)
 		VALUES
 		  (
 			#{floorId}, #{productId}, #{name}, #{link},
-			#{image},#{appletsImage}, #{adsImage}, #{label}, #{content}, #{pcStatus}, #{appletsStatus},
+			#{image},#{appletsImage}, #{adsImage}, #{label}, #{content}, #{pcStatus}, #{appletsStatus}, #{recommend},
 			#{sort}, #{createDate}, #{centreId}, #{displaySort}
 		  )
 	</insert>

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

@@ -1345,11 +1345,4 @@
         INSERT INTO cm_pay_shop_record (shopID, shopOrderID, shopOrderNo, payAmount, wipePayment, payType, payTime, payShopID, status, delFlag)
         VALUES (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{wipePayment}, #{payType}, #{payTime}, #{payShopId}, #{status}, #{delFlag})
     </insert>
-
-    <update id="updateBrokerage">
-        UPDATE cm_shop_order SET
-            brokerage = #{brokerage}
-        WHERE shopOrderID = #{shopOrderID}
-    </update>
-
 </mapper>

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

@@ -765,14 +765,11 @@
         co.status AS status,
         bou.name AS buyer,
         s.name AS shopName,
-        c.name AS clubName,
-        cdr.payWay AS payWay
+        c.name AS clubName
         from cm_shop_order a
         left join cm_pay_shop_record cpsr on a.shopOrderID = cpsr.shopOrderID
         left join bp_order_userinfo bou on bou.orderId = a.orderID
         left join cm_order co on co.orderID = a.orderID
-        LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
-        LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         left join shop s on s.shopID = a.shopID
         LEFT JOIN club c ON c.userID = a.userID
         <where>
@@ -1136,7 +1133,6 @@
           AND cror.delFlag = 0
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0
-          AND a.receiptStatus=3
           AND co.orderID NOT IN (
             SELECT orderID
             FROM cm_order_product
@@ -1162,14 +1158,4 @@
         WHERE orderID = #{orderid}
     </select>
 
-    <select id="payWay" resultType="java.lang.Integer">
-        SELECT  cdr.payWay
-        FROM cm_shop_order a
-                 LEFT JOIN cm_order co ON co.orderID = a.orderID
-                 LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
-                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        WHERE a.shopOrderID =  #{shopOrderID}
-    </select>
-
-
 </mapper>

src/main/resources/mappings/modules/product/CmBigtypeMapper.xml

@@ -12,7 +12,8 @@
 		a.wwwIcon AS "wwwIcon",
 		a.crmIcon AS "crmIcon",
 		a.addTime AS "addTime",
-		ifnull(a.typeSort,'0')  AS "typeSort"
+		ifnull(a.typeSort,'0')  AS "typeSort",
+		a.mallType
 	</sql>
 
 	<!--事务过程 修改分类 批量更新商品编码 存储过程名称 caimei4developer.update_productcode_big-->
@@ -69,9 +70,12 @@
 			<if test="sortIndex != null and sortIndex != ''">
 				AND a.sortIndex = #{sortIndex}
 			</if>
-			<if test="typeSort != null and typeSort != ''">
+			<if test="typeSort != null and typeSort != '' and typeSort != 'null'">
 				AND a.typeSort = #{typeSort}
 			</if>
+			<if test="null != mallType">
+				and mallType = #{mallType}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -111,7 +115,8 @@
 			wwwIcon,
 			crmIcon,
 			addTime,
-			sortIndex
+			sortIndex,
+			mallType
 		) VALUES (
 			#{typeSort},
 			#{name},
@@ -121,7 +126,8 @@
 			#{wwwIcon},
 			#{crmIcon},
 			#{addTime},
-			#{sortIndex}
+			#{sortIndex},
+		    #{mallType}
 		)
 	</insert>
 
@@ -155,6 +161,9 @@
 			 <if test="sortIndex != null and sortIndex != ''">
 				 sortIndex = #{sortIndex},
 			 </if>
+			 <if test="mallType != null">
+				 mallType = #{mallType},
+			 </if>
 		 </set>
 		WHERE bigTypeID = #{bigTypeID}
 	</update>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeBannerForm.jsp

@@ -248,7 +248,6 @@
 		};
 		var observer = new MutationObserver(function (mutations) {
 			$.each(mutations, function (index, item) {
-			    debugger
 				if (item.type === 'childList') {
 					// 在创建新的 element 时调用
 					var target = $(item.target),

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

@@ -278,7 +278,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

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

@@ -7,10 +7,7 @@
     <title>退款退货记录</title>
     <meta name="decorator" content="default"/>
     <style media="print">
-        @page {
-            size: landscape;
-        }
-
+        @page { size: landscape; }
         .refund-btn-top, .nav {
             display: none;
         }
@@ -46,64 +43,47 @@
             text-align: center;
             white-space: nowrap;
         }
-
-        .controls {
+        .controls{
             font-size: 0;
         }
-
-        .controls .conList {
+        .controls .conList{
             display: inline-block;
             margin-right: 15px;
         }
-
-        .conList .btn:nth-of-type(1) {
+        .conList .btn:nth-of-type(1){
             margin-left: 25px;
         }
-
         .refund-btn-top {
             float: right;
             margin-top: -18px;
             margin-right: 10px;
             height: 40px;
         }
-
         #enlarge-box {
             position: fixed;
             /*width: 325px;*/
             top: 50%;
             left: 50%;
-            transform: translate(-50%, -50%);
+            transform: translate(-50%,-50%);
             border: 2px solid #eee;
             background: #fff;
             display: none;
         }
-
-        .zeroCost .message {
-            display: none;
-            position: absolute;
-            background: #FFF;
-            white-space: nowrap;
-            border: 1px solid black;
+        .zeroCost .message{
+            display:none;
+            position:absolute;
+            background:#FFF;
+            white-space:nowrap;
+            border:1px solid black;
 
         }
-
-        .zeroCost:hover .message {
+        .zeroCost:hover .message{
             display: inline-block;
             color: black;
             padding: 5px;
             margin-left: 10px;
         }
-
-        .weishaIcon {
-            background: darkorange;
-            color: white;
-            margin: 0 0px;
-            padding: 0 3px;
-            font-style: normal;
-            font-size: 12px;
-            display: inline-block;
-            border-radius: 2px
-        }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -127,16 +107,18 @@
         });
 
 
+
+
         function openClauseInfo(index) {
-            var content = $("#clauseContent" + index).val();
+            var content=$("#clauseContent"+index).val();
             if (content == '') {
                 return false;
             }
             $.jBox(content, {
-                title: $("#clauseName" + index).val(),
+                title: $("#clauseName"+index).val(),
                 width: $(top.document).width() - 440,
-                height: $(top.document).height() - 240,
-                buttons: {'关闭': true}
+                height: $(top.document).height()-240,
+                buttons: { '关闭': true }
             });
         }
     </script>
@@ -148,24 +130,19 @@
     <c:if test="${from eq '3'}">
         <li><a href="${ctx}/shopOrder/checkPaymentOrder">订单财务信息</a></li>
     </c:if>
-    <li class="active"><a
-            href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款退货详情</a>
-    </li>
+    <li class="active"><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款退货详情</a></li>
 </ul>
 <br/>
 <div class="refund-btn-top">
     <c:if test="${from ne '3'}">
-        <input type="button" class="btn btn-primary"
-               onclick="window.location.href='${ctx}${cmReturnedPurchase.orderType eq 2?'/hehe/new/order/orderList':'/order/orderList'}'"
-               value="返回">
+    <input type="button" class="btn btn-primary" onclick="window.location.href='${ctx}${cmReturnedPurchase.orderType eq 2?'/hehe/new/order/orderList':'/order/orderList'}'"  value="返回">
     </c:if>
 </div>
 <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
-    <form:form id="inputForm${cmReturnedPurchaseStatus.index}" modelAttribute="cmReturnedPurchase"
-               action="${ctx}/bulkpurchase/cmRefundsProduct/saveRefound" method="post"
+    <form:form id="inputForm${cmReturnedPurchaseStatus.index}" modelAttribute="cmReturnedPurchase" action="${ctx}/bulkpurchase/cmRefundsProduct/saveRefound" method="post"
                class="form-horizontal">
         <c:if test="${cmReturnedPurchaseStatus.index ne 0}">
-            <hr style="height:5px;border:none;border-top:5px ridge green;"/>
+            <hr style="height:5px;border:none;border-top:5px ridge green;" />
         </c:if>
         <%--审核模块--%>
         <c:if test="${not empty cmReturnedPurchase.confirmReturnTime}">
@@ -191,24 +168,19 @@
                         <c:if test="${not empty cmReturnedPurchase.reviewImage1 || not empty cmReturnedPurchase.reviewImage2  || not empty cmReturnedPurchase.reviewImage3  || not empty cmReturnedPurchase.reviewImage4  || not empty cmReturnedPurchase.reviewImage5}">
                             审核凭证：
                             <c:if test="${not empty cmReturnedPurchase.reviewImage1}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                     src="${cmReturnedPurchase.reviewImage1}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage1}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage2}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                     src="${cmReturnedPurchase.reviewImage2}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage2}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage3}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                     src="${cmReturnedPurchase.reviewImage3}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage3}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage4}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                     src="${cmReturnedPurchase.reviewImage4}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage4}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage5}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                     src="${cmReturnedPurchase.reviewImage5}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage5}">
                             </c:if>
                         </c:if>
                     </td>
@@ -239,28 +211,22 @@
                     <c:if test="${not empty cmReturnedPurchase.image1 || not empty cmReturnedPurchase.image2 || not empty cmReturnedPurchase.image3 || not empty cmReturnedPurchase.image4 || not empty cmReturnedPurchase.image5}">
                         申请凭证：
                         <c:if test="${not empty cmReturnedPurchase.image1}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image1}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image1}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image2}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image2}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image2}">
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.image3}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image3}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image3}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image3}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image3}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image3}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image4}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image4}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image4}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image5}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px"
-                                 src="${cmReturnedPurchase.image5}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image5}">
                         </c:if>
                     </c:if>
                 </td>
@@ -280,9 +246,7 @@
                         ${cmReturnedPurchase.returnTime}
                 </td>
                 <td><b>申请金额：</b>
-                    <span class="refundFee"><fmt:formatNumber
-                            value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}"
-                            pattern="#0.00"/></span>元&nbsp;&nbsp;&nbsp;(账户余额抵扣：${order.balancePayFee})
+                    <span class="refundFee"><fmt:formatNumber value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}" pattern="#0.00"/></span>元&nbsp;&nbsp;&nbsp;(账户余额抵扣：${order.balancePayFee})
                 </td>
                 <td><b>退款审核状态：</b>
                     <c:if test="${empty cmReturnedPurchase.status}">
@@ -302,7 +266,7 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="4">
+                <td  colspan="4" >
                     <b>退款方式：</b>
                     <c:if test="${cmReturnedPurchase.returnedWay eq 4}">
                         未支付无退款
@@ -310,20 +274,20 @@
                     <c:if test="${cmReturnedPurchase.returnedWay eq 1}">
                         <c:if test="${not empty cmReturnedPurchase.refundBalanceFee && cmReturnedPurchase.refundBalanceFee ne 0 }">
                             余额账户：<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundBalanceFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundBalanceFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.refundOnlineFee && cmReturnedPurchase.refundOnlineFee ne 0 }">
                             线上退回：<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundOnlineFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundOnlineFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
                         </c:if>
                         <br>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">
                             线下转账：<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundOfflineFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundOfflineFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
                             采美退款银行：
                             <c:if test="${cmReturnedPurchase.payType == '1'}">
-                                建设银行7297
+                               建设银行7297
                             </c:if>
                             <c:if test="${cmReturnedPurchase.payType == '2'}">
                                 中信银行0897
@@ -395,8 +359,7 @@
             </tr>
             <tr>
                 <td>
-                    订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00"
-                                            maxFractionDigits="2"/>
+                    订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2" />
                     <c:if test="${not empty order.couponOrderRecord}">
                         <c:if test="${order.couponOrderRecord.couponType eq 0}">
                             <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
@@ -417,7 +380,7 @@
                     <c:if test="${not empty order.heheCouponRecord}">
                         <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                             <font color="red">
-                                （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                                （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                             </font>
                         </a>
                     </c:if>
@@ -426,14 +389,11 @@
                     </c:if>
                 </td>
                 <td>
-                    应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00"
-                                            maxFractionDigits="2"/>(账户余额抵扣：${order.balancePayFee})
-                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}"
-                       style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
+                    应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}" style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
                 </td>
                 <td>
-                    经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"
-                                            maxFractionDigits="2"/>
+                    经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00" maxFractionDigits="2" />
                 </td>
                 <td>
                     机构运费：
@@ -506,8 +466,7 @@
                     <c:if test="${order.payStatus == 3}">
                         <font color="green">已付款</font>
                         <c:if test="${order.zeroCostFlag eq 1}">
-                            <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
-                                                                               style="width: 15px;margin-bottom: 4px"></span>
+                            <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
                                 <div class="message">
                                     <span>商品成本为0，直接置为已付款，无需付款供应商</span>
                                 </div>
@@ -518,7 +477,7 @@
                 <td>
                     退款状态:
                     <c:if test="${empty order.refundType}">
-                        <font color="red">无退款</font>
+                        <font>无退款</font>
                     </c:if>
                     <c:if test="${order.refundType == 1}">
                         <font color="#ff8c00">部分退款</font>
@@ -530,13 +489,12 @@
             </tr>
             <tr>
                 <td>
-                    机构：${order.buyer}
-                    <c:if test="${order.organizeID == 3}"></c:if>
+                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td>
                     收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})
                 </td>
-                <td colspan="2">
+                <td  colspan="2">
                     地址：${order.bpOrderUserinfo.province}${order.bpOrderUserinfo.city}${order.bpOrderUserinfo.town}${order.bpOrderUserinfo.address}
                 </td>
             </tr>
@@ -545,140 +503,88 @@
         <%--单次退款商品信息汇总--%>
 
         <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">
-            <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturneds"
-                       varStatus="shopOrderReturnedStatus">
-                <tr>
-                    <td colspan="7">
-                        <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}"
-                               class="table table-striped table-bordered table-condensed">
-                            <tr>
-                                <td style="width: 300px;">
-                                    子订单编号(ID)：${shopOrderReturneds.shopOrderNo}(${shopOrderReturneds.shopOrderID})
-                                </td>
-                                <td style="width: 250px;">子订单金额：${shopOrderReturneds.productAmount}</td>
-                                <td>
-                                        <%--                                        收款状态：${fns:getDictLabel(shopOrderReturneds.shopReceiptStatus,'receiptStatus' ,'' )}--%>
-                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 1}">
-                                        <font color="red">待收款</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 2}">
-                                        <font color="#ff8c00">部分收款</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 3}">
-                                        <font color="green">已收款</font>
-                                    </c:if>
-                                </td>
-                                <td>发货状态：
-                                        <%--                                            ${fns:getDictLabel(shopOrderReturneds.sendOutStatus,'sendOutStatus' ,'' )}--%>
-                                    <c:if test="${shopOrderReturneds.sendOutStatus == 1}">
-                                        <font color="red">待发货</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.sendOutStatus == 2}">
-                                        <font color="#ff8c00">部分发货</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.sendOutStatus == 3}">
-                                        <font color="green">已发货</font>
-                                    </c:if>
-                                </td>
-                                <td>付款状态：
-                                        <%--                                            ${fns:getDictLabel(shopOrderReturneds.payStatus,'payStatus' ,'' )}--%>
-                                    <c:if test="${shopOrderReturneds.payStatus == 1}">
-                                        <font color="red">待付款</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.payStatus == 2}">
-                                        <font color="#ff8c00">部分付款</font>
-                                    </c:if>
-                                    <c:if test="${shopOrderReturneds.payStatus == 3}">
-                                        <font color="green">已付款</font>
-                                    </c:if>
-                                </td>
-                                <td>供应商：${shopOrderReturneds.shopName}</td>
-                            </tr>
-                            <c:if test="${order.onlinePayFlag eq 0}">
+                <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturneds" varStatus="shopOrderReturnedStatus">
+                    <tr>
+                        <td colspan="7">
+                            <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
                                 <tr>
+                                    <td style="width: 300px;">子订单编号(ID)：${shopOrderReturneds.shopOrderNo}(${shopOrderReturneds.shopOrderID})</td>
+                                    <td  style="width: 250px;">子订单金额：${shopOrderReturneds.productAmount}</td>
                                     <td>
-                                        商品总额：￥<fmt:formatNumber type="number"
-                                                                value="${shopOrderReturneds.needPayAmount}"
-                                                                pattern="0.00" maxFractionDigits="2"/>
-                                    </td>
-                                    <td>
-                                        优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}"
-                                                              pattern="0.00" maxFractionDigits="2"/>
+                                        收款状态：${fns:getDictLabel(shopOrderReturneds.shopReceiptStatus,'receiptStatus' ,'' )}
                                     </td>
-                                    <td>
-                                        应付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.realPay}"
-                                                                pattern="0.00" maxFractionDigits="2"/>
+                                    <td>发货状态：
+                                            ${fns:getDictLabel(shopOrderReturneds.sendOutStatus,'sendOutStatus' ,'' )}
                                     </td>
-                                    <td>
-                                        已付金额：￥<fmt:formatNumber type="number"
-                                                                value="${shopOrderReturneds.receiptAmount}"
-                                                                pattern="0.00" maxFractionDigits="2"/>
+                                    <td>付款状态：
+                                            ${fns:getDictLabel(shopOrderReturneds.payStatus,'payStatus' ,'' )}
                                     </td>
-                                    <td>
-                                        待付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.restAmount}"
-                                                                pattern="0.00" maxFractionDigits="2"/>
-                                    </td>
-                                </tr>
-                            </c:if>
-                            <c:forEach items="${shopOrderReturneds.cmReturnedPurchaseProductList}"
-                                       var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
-                                <tr>
-                                    <td rowspan="4" style="width: 295px;height: 125px">
-                                        <img style="width: 100px;height: 100px"
-                                             src="${cmReturnedPurchaseProduct.mainImage}">
-                                        <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
-                                    </td>
-                                    <td>单价：￥${cmReturnedPurchaseProduct.price}<c:if
-                                            test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if></td>
-                                    <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
-                                    <td>折扣：${cmReturnedPurchaseProduct.discount}</td>
-                                    <td>折后单价：￥${cmReturnedPurchaseProduct.discountPrice}</td>
-                                    <td>
-                                        购买数量（赠品数）X${cmReturnedPurchaseProduct.num}(${cmReturnedPurchaseProduct.presentNum})
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>税率：${cmReturnedPurchaseProduct.taxRate}</td>
-                                    <td>税费：￥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
-                                    <td colspan="2">总额：￥${cmReturnedPurchaseProduct.totalFee}</td>
+                                    <td>供应商：${shopOrderReturneds.shopName}</td>
                                 </tr>
-                                <tr>
-                                    <td><font
-                                            color="red">已发货：${cmReturnedPurchaseProduct.num+cmReturnedPurchaseProduct.presentNum - cmReturnedPurchaseProduct.notOutStore}</font>
-                                    </td>
-                                    <td><font color="red">已退货：<span
-                                            id="applicationReturnedNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.returnedPurchaseProductNum}</span></font>
-                                    </td>
-                                    <td colspan="2"><font color="red">本次退货：
-                                            ${empty cmReturnedPurchaseProduct.actualReturnedNum ? 0 : cmReturnedPurchaseProduct.actualReturnedNum}
-                                    </font>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td><font
-                                            color="red">待发货：${cmReturnedPurchaseProduct.notOutStore - cmReturnedPurchaseProduct.cancelProductNum}</font>
-                                    </td>
-                                    <td><font color="red">已取消：<span
-                                            id="applicationCancelNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.cancelProductNum}</span></font>
-                                    </td>
-                                    <td colspan="2"><font color="red">本次取消：
-                                            ${empty cmReturnedPurchaseProduct.actualCancelNum ? 0 : cmReturnedPurchaseProduct.actualCancelNum}
-                                    </font>
-                                    </td>
-                                </tr>
-                                <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
-                            </c:forEach>
-                        </table>
-                    </td>
-                </tr>
-            </c:forEach>
+                                <c:if test="${order.onlinePayFlag eq 0}">
+                                    <tr>
+                                        <td>
+                                            商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                        <td>
+                                            优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                        <td>
+                                            应付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.realPay}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                        <td>
+                                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                        <td>
+                                            待付金额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.restAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                    </tr>
+                                </c:if>
+                                <c:forEach items="${shopOrderReturneds.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
+                                    <tr>
+                                        <td  rowspan="4" style="width: 295px;height: 125px">
+                                            <img style="width: 100px;height: 100px"  src="${cmReturnedPurchaseProduct.mainImage}">
+                                            <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
+                                        </td>
+                                        <td>单价：￥${cmReturnedPurchaseProduct.price}<c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if></td>                                            <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
+                                        <td>折扣：${cmReturnedPurchaseProduct.discount}</td>
+                                        <td>折后单价：￥${cmReturnedPurchaseProduct.discountPrice}</td>
+                                        <td>购买数量（赠品数）X${cmReturnedPurchaseProduct.num}(${cmReturnedPurchaseProduct.presentNum})</td>
+                                    </tr>
+                                    <tr>
+                                        <td>税率：${cmReturnedPurchaseProduct.taxRate}</td>
+                                        <td>税费：￥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
+                                        <td colspan="2">总额：￥${cmReturnedPurchaseProduct.totalFee}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><font color="red">已发货：${cmReturnedPurchaseProduct.num+cmReturnedPurchaseProduct.presentNum - cmReturnedPurchaseProduct.notOutStore}</font></td>
+                                        <td><font color="red">已退货：<span id="applicationReturnedNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.returnedPurchaseProductNum}</span></font></td>
+                                        <td colspan="2"><font color="red">本次退货：
+                                                ${empty cmReturnedPurchaseProduct.actualReturnedNum ? 0 : cmReturnedPurchaseProduct.actualReturnedNum}
+                                        </font>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><font color="red">待发货：${cmReturnedPurchaseProduct.notOutStore - cmReturnedPurchaseProduct.cancelProductNum}</font></td>
+                                        <td><font color="red">已取消：<span id="applicationCancelNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.cancelProductNum}</span></font></td>
+                                        <td colspan="2"><font color="red">本次取消：
+                                                ${empty cmReturnedPurchaseProduct.actualCancelNum ? 0 : cmReturnedPurchaseProduct.actualCancelNum}
+                                        </font>
+                                        </td>
+                                    </tr>
+                                    <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
+                                </c:forEach>
+                            </table>
+                        </td>
+                    </tr>
+                </c:forEach>
 
         </table>
     </form:form>
 </c:forEach>
 
 <c:if test="${empty cmReturnedPurchaseList}">
-    <p style="text-align: center;"><font color="#1e90ff">暂无退货退款详情记录.....</font></p>
+    <p style="text-align: center;"><font  color="#1e90ff">暂无退货退款详情记录.....</font></p>
 </c:if>
 <c:if test="${not empty cmReturnedPurchaseList}">
     <table id="orderTable" class="table table-striped table-bordered table-condensed">
@@ -686,14 +592,11 @@
             <td>
                 <div class="order-rows">
                     <label>发票信息：</label>
-                    <input id="invoice1" class="invoice1" name="invoice"
-                           type="radio" ${order.orderInvoice.type == 0 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice1" class="invoice1" name="invoice" type="radio" ${order.orderInvoice.type == 0 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice1">不需要发票</label>
-                    <input id="invoice2" name="invoice"
-                           type="radio" ${order.orderInvoice.type == 1 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice2" name="invoice" type="radio" ${order.orderInvoice.type == 1 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice2">普通发票</label>
-                    <input id="invoice3" name="invoice"
-                           type="radio" ${order.orderInvoice.type == 2 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice3" name="invoice" type="radio" ${order.orderInvoice.type == 2 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice3">增值税发票</label>
                     <c:if test="${order.orderInvoice.type == 1}">
                         <br>
@@ -766,28 +669,28 @@
 <script type="text/javascript" src="${ctxStatic}/modules/bulkpurchase/stages.js"></script>
 <script>
     $(function () {
-        $('.print-now').on('click', function () {
+        $('.print-now').on('click',function() {
             window.print();
         })
     });
 
-    (function () {
-        $('body').click(function (e) {
+    (function(){
+        $('body').click(function(e) {
             var target = $(e.target),
                 $block = $('.operation-block');
-            if (target.is('.operation-btn')) {
-                if ($block.css('display') === 'none') {
+            if(target.is('.operation-btn')) {
+                if($block.css('display') === 'none') {
                     $block.show();
                 } else {
                     $block.hide();
                 }
             }
-            if (!target.is('.operation-block') && !target.is('.operation-btn')) {
+            if(!target.is('.operation-block') && !target.is('.operation-btn')) {
                 $block.hide();
             }
         });
 
-        $('.clauseId').each(function () {
+        $('.clauseId').each(function() {
             var self = $(this);
             if (!self.prop("checked")) {
                 self.parent().hide();
@@ -806,16 +709,16 @@
             }
         })
 
-        $('body').on('mouseover', '.enlarge-pic', function () {
+        $('body').on('mouseover', '.enlarge-pic', function() {
             var thisSrc = $(this).attr('src'),
                 enlargeBox = $('#enlarge-box');
-            if (thisSrc) {
+            if(thisSrc) {
                 enlargeBox.show(50);
-                $('#enlarge-box').find('img').attr('src', thisSrc);
+                $('#enlarge-box').find('img').attr('src',thisSrc);
             }
         })
 
-        $('body').on('mouseout', '.enlarge-pic', function () {
+        $('body').on('mouseout', '.enlarge-pic', function() {
             var enlargeBox = $('#enlarge-box');
             enlargeBox.hide();
         })

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

@@ -345,7 +345,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

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

@@ -144,16 +144,7 @@
             </c:if>
         </td>
         <td>
-            收款状态：<%--${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}--%>
-            <c:if test="${order.receiptStatus == 1}">
-                <font color="red">待收款</font>
-            </c:if>
-            <c:if test="${order.receiptStatus == 2}">
-                <font color="#ff8c00">部分收款</font>
-            </c:if>
-            <c:if test="${order.receiptStatus == 3}">
-                <font color="green">已收款</font>
-            </c:if>
+            收款状态：${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}
         </td>
         <c:if test="${order.orderType eq 2}">
             <td>
@@ -171,17 +162,7 @@
             </td>
         </c:if>
         <td>
-            付款状态：<%--${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}--%>
-            <c:if test="${order.payStatus == 1}">
-                <font color="red">待付款</font>
-            </c:if>
-            <c:if test="${order.payStatus == 2}">
-                <font color="#ff8c00">部分付款</font>
-            </c:if>
-            <c:if test="${order.payStatus == 3}">
-                <font color="green">已付款</font>
-            </c:if>
-
+            付款状态：${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}
             <c:if test="${order.zeroCostFlag eq 1}">
                 <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
                     <div class="message">
@@ -191,16 +172,7 @@
             </c:if>
         </td>
         <td>
-<%--            退款（退货）状态：${fns:getDictLabel(order.refundType,'refundType' ,'' )}--%>
-    <c:if test="${order.refundType == 1}">
-        <font color="red">待发货</font>
-    </c:if>
-    <c:if test="${order.refundType == 2}">
-        <font color="#ff8c00">部分发货</font>
-    </c:if>
-    <c:if test="${order.refundType == 3}">
-        <font color="green">已发货</font>
-    </c:if>
+            退款（退货）状态：${fns:getDictLabel(order.refundType,'refundType' ,'' )}
         </td>
     </tr>
     <tr>
@@ -240,7 +212,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>
@@ -365,4 +337,4 @@
 
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCouponForm.jsp

@@ -99,8 +99,28 @@
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/hehe/cmHeheCoupon/?couponType=${cmHeheCoupon.couponType}">优惠券列表</a></li>
-		<li class="active"><a href="${ctx}/hehe/cmHeheCoupon/form?id=${cmHeheCoupon.id}&couponType=${cmHeheCoupon.couponType}">${not empty cmHeheCoupon.id?'编辑':'添加'}${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':'好友消费'}券</a></li>
+		<li class="active"><a href="${ctx}/hehe/cmHeheCoupon/form?id=${cmHeheCoupon.id}&couponType=${cmHeheCoupon.couponType}">${not empty cmHeheCoupon.id?'编辑':'添加'}${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券</a></li>
 	</ul><br/>
+	<label style="color: red;margin-left: 20px;margin-bottom: 15px;font-size: 14px">
+		<c:if test="${cmHeheCoupon.couponType eq 1}">
+			活动券适合在某些节日或者主题活动时创建，且适用于所有用户以及商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 2}">
+			专享券适用于指定的用户，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 3}">
+			新人券适合新登录的用户，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 4}">
+			好友邀请券适用于将商城商品分享给好友，该券且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 5}">
+			好友消费券适合分享后的好友消费，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 6}">
+			消费分享券适合每完成一笔订单后的分享，且适用于商城全部商品或指定商品。
+		</c:if>
+	</label>
 	<form:form id="inputForm" modelAttribute="cmHeheCoupon" action="${ctx}/hehe/cmHeheCoupon/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<form:hidden path="productInfo"/>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCouponList.jsp

@@ -27,6 +27,7 @@
 		<li class="${cmHeheCoupon.couponType eq 3?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=3">新人券</a></li>
 		<li class="${cmHeheCoupon.couponType eq 4?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=4">好友邀请券</a></li>
 		<li class="${cmHeheCoupon.couponType eq 5?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=5">好友消费券</a></li>
+		<li class="${cmHeheCoupon.couponType eq 6?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=6">消费分享券</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmHeheCoupon" action="${ctx}/hehe/cmHeheCoupon/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -44,7 +45,7 @@
 				</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<a class="btn btn-primary" href="${ctx}/hehe/cmHeheCoupon/form?couponType=${cmHeheCoupon.couponType}" style="margin-left: 15px">
-				添加${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':'好友消费'}券
+				添加${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券
 			</a>
 			<div class="clearfix"></div>
 		</div>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheImageForm.jsp

@@ -107,6 +107,12 @@
 				</div>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label">链接：</label>
+			<div class="controls">
+				<form:input path="link" htmlEscape="false" class="input-xxlarge"/>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>排序：</label>
 			<div class="controls">

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheProductForm.jsp

@@ -157,7 +157,7 @@
 		});
 
 
-		;(function ($, window, document, undefined) {
+		/*;(function ($, window, document, undefined) {
 			//用一个自调用匿名函数把插架代码包裹起来，防止代码污染
 			$.fn.mySelect = function (options) {
 				var defaults = {
@@ -260,7 +260,7 @@
 					$("#floorIds").val(res)
 				},
 			})
-		})
+		})*/
 	</script>
 </head>
 <body>
@@ -272,7 +272,7 @@
 		<form:hidden path="id"/>
 		<form:hidden path="productId" id="productId"/>
 		<sys:message content="${message}"/>
-        <form:hidden path="floorIds"/>
+<%--        <form:hidden path="floorIds"/>--%>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>商品：</label>
 			<div class="controls" id="addProduct">
@@ -348,6 +348,23 @@
 				</div>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>商品分类：</label>
+			<div class="controls">
+				<form:select path="bigTypeId" class="input-small required" id="bigType" onchange="loadSmallType()">
+					<form:option value="" label="请选择"/>
+					<form:options items="${classify.bigTypeList}" itemLabel="name" itemValue="bigTypeID"
+								  htmlEscape="false"/>
+				</form:select>
+				<form:select path="smallTypeId" class="input-small required" id="smallType">
+					<form:option value="" label="请选择"/>
+					<c:forEach items="${classify.smalltypeList}" var="smallType">
+						<form:option value="${smallType.smallTypeID}" label="${smallType.name}"
+									 bigTypeId="${smallType.bigTypeID}"/>
+					</c:forEach>
+				</form:select>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>商品状态：</label>
 			<div class="controls">
@@ -359,7 +376,7 @@
 			</div>
 		</div>
 		<c:if test="${cmHeheProduct.id eq null}">
-			<div class="control-group">
+			<%--<div class="control-group">
 				<label class="control-label">首页楼层：</label>
 				<div class="controls" style="overflow: visible">
 					<div id="demo1" class="selectPickerWrapper">
@@ -370,7 +387,7 @@
 						</select>
 					</div>
 				</div>
-			</div>
+			</div>--%>
 			<div class="control-group">
 				<label class="control-label">商城活动：</label>
 				<div class="controls">
@@ -537,6 +554,98 @@
 			obj.value = '';
 		}
 	}
+
+	$(window).load(function () {
+		loadInitType();
+	});
+
+	// 网站分类
+	var currentBigtype = ${empty cmHeheProduct.bigTypeId?0:cmHeheProduct.bigTypeId};
+	var currentSmalltype = ${empty cmHeheProduct.smallTypeId?0:cmHeheProduct.smallTypeId};
+	var bigTypeList = [
+		<c:forEach items="${classify.bigTypeList}" var="bigType" varStatus="index">
+		<c:if test="${index.index > 0}">, </c:if>
+		{
+			bigTypeId: ${bigType.bigTypeID},
+			name: "${bigType.name}",
+			typeSort: ${bigType.typeSort}
+		}
+		</c:forEach>
+	];
+	var smalltypeList = [
+		<c:forEach items="${classify.smalltypeList}" var="smalltype" varStatus="index">
+		<c:if test="${index.index > 0}">, </c:if>
+		{
+			smallTypeId: ${smalltype.smallTypeID},
+			name: "${smalltype.name}",
+			bigTypeId: ${smalltype.bigTypeID},
+		}
+		</c:forEach>
+	];
+	
+	
+	// 初始分类
+	function loadInitType() {
+		if (currentBigtype != null && typeof (currentBigtype) != "undefined") {
+			setTimeout(function () {
+				loadBigType();
+			}, 0);
+		}
+	}
+
+	// 分类联动
+	function loadBigType() {
+		$("#bigType").html("");
+		$("#bigType").prev().find(".select2-chosen").text("请选择");
+		$("#bigType").append("<option value=''>请选择</option>");
+		$("#smallType").html("");
+		$("#smallType").prev().find(".select2-chosen").text("请选择");
+		$("#smallType").append("<option value=''>请选择</option>");
+		$("#tinyType").html("");
+		$("#tinyType").prev().find(".select2-chosen").text("请选择");
+		$("#tinyType").append("<option value=''>请选择</option>");
+		for (var i = 0; i < bigTypeList.length; i++) {
+			if (currentBigtype != null && typeof (currentBigtype) != "undefined" && currentBigtype == bigTypeList[i].bigTypeId) {
+				$("#bigType").append("<option selected value='" + bigTypeList[i].bigTypeId + "'>" + bigTypeList[i].name + "</option>");
+				$("#bigType").prev().find(".select2-chosen").text(bigTypeList[i].name);
+				setTimeout(function () {
+					loadSmallType();
+				}, 500);
+			} else {
+				$("#bigType").append("<option value='" + bigTypeList[i].bigTypeId + "'>" + bigTypeList[i].name + "</option>");
+			}
+		}
+		loadSmallType();
+	}
+
+	function loadSmallType(id) {
+		if (id) {
+			$("#bigType").val(id);
+			$("#bigType").prev().find(".select2-chosen").text($("#bigType option:selected").text());
+		}
+		var bigType = $("#bigType").val();
+		$("#smallType").html("");
+		$("#smallType").prev().find(".select2-chosen").text("请选择");
+		$("#smallType").append("<option value=''>请选择</option>");
+		$("#tinyType").html("");
+		$("#tinyType").prev().find(".select2-chosen").text("请选择");
+		$("#tinyType").append("<option value=''>请选择</option>");
+		if (typeof (bigType) != "undefined" && bigType != "") {
+			var smallTypeNum = 0;
+			for (var i = 0; i < smalltypeList.length; i++) {
+				if (bigType == smalltypeList[i].bigTypeId) {
+					smallTypeNum = smallTypeNum + 1;
+					if (currentSmalltype != null && typeof (currentSmalltype) != "undefined" && currentSmalltype == smalltypeList[i].smallTypeId) {
+						$("#smallType").append("<option selected value='" + smalltypeList[i].smallTypeId + "'>" + smalltypeList[i].name + "</option>");
+						$("#smallType").prev().find(".select2-chosen").text(smalltypeList[i].name);
+					} else {
+						$("#smallType").append("<option value='" + smalltypeList[i].smallTypeId + "'>" + smalltypeList[i].name + "</option>");
+					}
+				}
+			}
+			document.getElementById("s2id_smallType").style.cssText = "display: inline-block";
+		}
+	}
 </script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheReductionList.jsp

@@ -117,7 +117,6 @@
 				};
 				$.jBox.confirm("确定下架该活动吗？", "提示", submit, {buttons: {'确认': true, '取消': false}});
 			} else {
-				debugger
 				status = 2;
 				// 待上架活动上架
 				var submit = function (v, h, f) {
@@ -157,7 +156,6 @@
 					var $jboxFrame = top.$('#jbox-iframe');
 					var $mainFrame = top.$('#mainFrame');
 					if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-						debugger
 						var items = $jboxFrame[0].contentWindow.getCheckedItems(0);
 						if (items.length > 0) {
 							var startTime = items[0].startTime;

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -197,7 +197,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>
@@ -286,7 +286,7 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${empty order.rechargeGoods}">
+                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>
@@ -539,7 +539,7 @@
                                 <c:if test="${op.productPromotion.mode ne 1}">
                                     <fmt:formatNumber value="${op.price}" type="currency"/>
                                 </c:if>
-                                <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 2}">
+                                <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 1}">
                                     <a href="javascript:;" class="ladderPrice"><span> (阶梯价格)</span>
                                         <c:if test="${not empty op.orderProductLadderPriceList}">
                                             <div class="list">

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderList.jsp

@@ -662,6 +662,13 @@
                 }
             }, "JSON");//这里返回的类型有：json,html,xml,text
         };
+
+        function orderExport() {
+            var searchForm = $("#searchForm");
+            searchForm.attr('action', '${ctx}/hehe/new/order/batchExportOrder');
+            searchForm.submit();
+            searchForm.attr('action', '${ctx}/hehe/new/order/orderList');
+        }
     </script>
 </head>
 <body>
@@ -776,6 +783,9 @@
             <div class="item">
                 <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" style="margin-left: 20px;"/>
             </div>
+            <div class="item">
+                <a id="orderExport" class="btn btn-primary" href="javascript:;" onclick="orderExport()" style="width:100px; margin-left: 20px;">订单导出</a>
+            </div>
         </div>
     </div>
 </form:form>
@@ -894,13 +904,13 @@
             </li>
             <li>
                 <c:if test="${order.sendOutStatus == 1}">
-                    待发货
+                    <font color="red">待发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 2}">
-                    部分发货
+                    <font color="##FF9966">部分发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 3}">
-                    已发货
+                    <font color="green">已发货</font>
                 </c:if>
             </li>
             <li>
@@ -975,6 +985,10 @@
                     </shiro:hasPermission>
 
                     <shiro:hasPermission name="order:order:edit">
+                        <c:if test="${order.status == 0 || order.status == 11}">
+                            <a href="${ctx}/hehe/new/order/cancelOrder?orderID=${order.orderID}"
+                               onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
+                        </c:if>
                         <c:if test="${order.status ne 0}">
                             <a href="${ctx}/order/printOrder?orderID=${order.orderID}">打印发货单</a>
                         </c:if>

src/main/webapp/WEB-INF/views/modules/hehe/receiveDetailsList.jsp

@@ -40,6 +40,7 @@
 					<form:option value="3" label="新人券"/>
 					<form:option value="4" label="好友邀请券"/>
 					<form:option value="5" label="好友消费券"/>
+					<form:option value="6" label="消费分享券"/>
 				</form:select>
 			<label>状态：</label>
 				<form:select path="useStatus" class="input-medium">
@@ -74,7 +75,7 @@
 					${cmHeheCoupon.name}
 				</td>
 				<td>
-					${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友分享':'好友消费'}券
+					${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友分享':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券
 				</td>
 				<td>
 					${cmHeheCoupon.couponAmount}

src/main/webapp/WEB-INF/views/modules/hehe/receiveUserList.jsp

@@ -81,7 +81,7 @@
                     ${user.mobile}
             </td>
             <td>
-                    ${user.source eq 1 ? "小程序":"订单退回"}
+                    ${user.source eq 1 ? "小程序":user.source eq 2 ?"订单退回":"领券购买"}
             </td>
             <td>
                     <fmt:formatDate value="${user.receiveTime}" pattern="yyyy-MM-dd HH:mm:ss" />

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

@@ -490,13 +490,13 @@
                     </td>
                     <td>
                         <c:if test="${s.refundType == 1}">
-                            <font color="#ff8c00">部分退款</font>
+                            部分退款
                         </c:if>
                         <c:if test="${s.refundType == 2}">
-                            <font color="green">已退款</font>
+                            已退款
                         </c:if>
                         <c:if test="${s.refundType != 1 && s.refundType != 2}">
-                            <font color="red">无退款</font>
+                            无退款
                         </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.returnValue}" type="number" pattern="#,##0.00"/></td>

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

@@ -460,7 +460,7 @@
 					resVal = '';
 				totalComissionEle = thisEle.find('.payCm'),
 				comissionEle = thisEle.find('.payCm-t'),
-				thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),//付第三方
+				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(',','')),

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

@@ -528,9 +528,7 @@
                     <tr>
                         <td>${s.shopOrderNo}(${s.shopOrderID})</td>
                         <td colspan="3">${s.shopName}</td>
-                        <c:if test="${empty s.brokerage}"><td colspan="3" class="payCm-t"></td></c:if>
-                        <c:if test="${not empty s.brokerage}"><td colspan="3" class="">${s.brokerage}</td></c:if>
-                         <%-- 子订单佣金=商品总佣金+机构运费-付第三方-供应商运费-分摊优惠--%>
+                        <td colspan="3" class="payCm-t"></td> <%-- 子订单佣金=商品总佣金+机构运费-付第三方-供应商运费-分摊优惠--%>
                         <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
 
                         <td class="taxes">

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

@@ -308,7 +308,6 @@
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode
 }" 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">
@@ -358,14 +357,12 @@
     <button id="select-all" style="color:white;background-color:#2F6FAB">全选</button>
     <c:if test="${operatingMode == '1'}">
         <button id="apply" class="t-btn" style="color:white;background-color:#2F6FAB">付款申请</button>
-<%--        <button id="applyShopOtherFee" class="t-btn" style="color:white;background-color:#2F6FAB">付第三方申请</button>--%>
+        <button id="applyShopOtherFee" class="t-btn" style="color:white;background-color:#2F6FAB">付第三方申请</button>
     </c:if>
     <c:if test="${operatingMode == '2'}">
         <button id="refund" class="t-btn">已付退款</button>
     </c:if>
     <c:forEach items="${page.list}" var="s" varStatus="sIndex">
-        <input id="shopReceiptStatus" type="hidden" value="${s.shopReceiptStatus}">
-        <input id="payWay" type="hidden" value="${s.payWay}">
         <div class="pay-list-item">
             <table class="table table-striped table-bordered table-condensed pay-table">
                 <tr>
@@ -588,10 +585,9 @@
                 </c:forEach>
             </table>
             <div class="pay-more-func">
-                <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
                 <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
                     <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                        <a id="applypayWay"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
+                        <a href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
                     </shiro:hasPermission>
                 </c:if>
                 <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
@@ -899,22 +895,12 @@
         });
 
         //付第三方
-
-        $('#applypayWay').on('click', function () {
-
-            var shopReceiptStatus=$('#shopReceiptStatus').val();
-            var payWay=$('#payWay').val();
-            console.log(payWay)
-            debugger
-            console.log(shopReceiptStatus)
-
-             if (payWay == 1 && shopReceiptStatus==2) {
-                alertx('线上支付的子订单不能直接修改成本！');
+        $('#applyShopOtherFee').on('click', function () {
+            var checked = $('.pay-wrapper input[type=checkbox]:checked');
+            if (checked.length < 1) {
+                alertx('请选择一个子订单');
                 return false;
-             }
-            });
-
-            $('#applyShopOtherFee').on('click', function () {
+            }
             if (checked.length > 1) {
                 alertx('每次只能选择一个子订单进行付第三方申请');
                 return false;

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

@@ -259,7 +259,6 @@
     <li class="active"><a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${payShopDifference.shopOrderId}">供应商差价</a></li>
 </ul>
 <form:form id="inputForm" modelAttribute="payShopDifference" action="${ctx}/order/cmPayShop/saveDifferencePrice" method="post" class="form-horizontal">
-    <input type="hidden" id="ShopReceiptStatus" value="${payShopDifference.shopReceiptStatus}">
     <form:hidden path="shopOrderId"/>
     <br>
     <div class="control-group">
@@ -501,14 +500,11 @@
     }
 
     function showInfo() {
-        debugger
         var type = $("input[name='type']:checked").val();
-        var ShopReceiptStatus=$('#ShopReceiptStatus').val();
-        console.log(ShopReceiptStatus)
         if (type == 1){
             $("#refundShow").hide();
             $("#payShopShow").show();
-        } else if(ShopReceiptStatus!=2){
+        } else {
             $("#payShopShow").hide();
             var differencePrice = $("#differencePrice").val();
             var waitPayShop = ${payShopDifference.waitPayShop};
@@ -521,4 +517,4 @@
     }
 </script>
 </body>
-</html>
+</html>

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

@@ -331,35 +331,35 @@
             </li>
             <li>
                 <c:if test="${order.payStatus == 1}">
-                     <font color="red">待付款</font>
+                    待付款
                 </c:if>
                 <c:if test="${order.payStatus == 2}">
-                     <font color="#ff8c00">部分付款</font>
+                    部分付款
                 </c:if>
                 <c:if test="${order.payStatus == 3}">
-                    <font color="green">已付款</font>
+                    已付款
                 </c:if>
             </li>
             <li>
                 <c:if test="${order.sendOutStatus == 1}">
-                      <font color="red">待发货</font>
+                    待发货
                 </c:if>
                 <c:if test="${order.sendOutStatus == 2}">
-                       <font color="#ff8c00">部分发货</font>
+                    部分发货
                 </c:if>
                 <c:if test="${order.sendOutStatus == 3}">
-                     <font color="green">已发货</font>
+                    已发货
                 </c:if>
             </li>
             <li>
                 <c:if test="${order.refundType == 1}">
-                      <font color="#ff8c00">部分退款</font>
+                    部分退款
                 </c:if>
                 <c:if test="${order.refundType == 2}">
-                      <font color="green">已退款</font>
+                    已退款
                 </c:if>
                 <c:if test="${order.refundType ne 1 and order.refundType ne 2 }">
-                     <font color="red">无退款</font>
+                    无退款
                 </c:if>
             </li>
             <li>

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

@@ -491,13 +491,13 @@
             <td>
                 退款状态:
                 <c:if test="${order.refundType == 0}">
-                     <font color="red">无退款</font>
+                    无退款
                 </c:if>
                 <c:if test="${order.refundType == 1}">
-                     <font color="#ff8c00">部分退款</font>
+                    部分退款
                 </c:if>
                 <c:if test="${order.refundType == 2}">
-                    <font color="green">已退款</font>
+                    已退款
                 </c:if>
             </td>
         </c:if>
@@ -620,7 +620,7 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${empty order.rechargeGoods}">
+                    <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>
@@ -639,7 +639,7 @@
                         </c:if>
                         <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
-                            <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
+                            <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && (order.ableUserMoney > 0 || order.status eq 0)}">
                                 <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
                                     <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
                                 </c:if>

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

@@ -178,13 +178,13 @@
                 </td>
                 <td>
                     <c:if test="${order.refundType == 1}">
-                          <font color="#ff8c00">部分退款</font>
+                        部分退款
                     </c:if>
                     <c:if test="${order.refundType == 2}">
-                         <font color="green">已退款</font>
+                        已退款
                     </c:if>
                     <c:if test="${order.refundType != 1 && order.refundType != 2}">
-                         <font color="red">无退款</font>
+                        无退款
                     </c:if>
                 </td>
                 <td><fmt:formatNumber value="${order.returnValue}" type="number" pattern="#,##0.00"/></td>

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

@@ -20,7 +20,6 @@
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/product/new/list?searchProductCategory=2">二手商品列表</a></li>
     <li><a href="${ctx}/product/cmSecondHandDetail/form?searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">添加二手商品</a></li>
-    <li><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="product" action="${ctx}/product/new/list" method="post" class="breadcrumb form-search">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

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

@@ -66,9 +66,9 @@
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
-					<div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
+					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
 					<c:if test="${not empty clubRemarks.clubType}">
-						<div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
 							机构类型：
 						</div>
 						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
@@ -76,7 +76,7 @@
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
-					<div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
+					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<c:if test="${not empty clubRemarks.pinceSensitve}">
@@ -84,16 +84,16 @@
 							价格敏感度 :
 						</div>
 						<c:if test="${clubRemarks.pinceSensitve eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">适中</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">适中</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
 						</c:if>
 
 					</c:if>
@@ -102,16 +102,16 @@
 							意向程度：
 						</div>
 						<c:if test="${clubRemarks.satisfied eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
 						</c:if>
 
 					</c:if>
@@ -120,13 +120,13 @@
 							跟进状态：
 						</div>
 						<c:if test="${clubRemarks.followup eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
 						</c:if>
 						<c:if test="${clubRemarks.followup eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
 						</c:if>
 						<c:if test="${clubRemarks.followup eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
 						</c:if>
 
 					</c:if>

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

@@ -143,16 +143,16 @@
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             咨询人 :
                         </div>
-                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构名称：
                         </div>
-                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
                         <c:if test="${not empty clubRemarks.clubType}">
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构类型：
                         </div>
-                        <div style=" width: 150px;float: left;margin: 10px 0;position: relative;">${clubRemarks.clubType}</div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
                         </c:if>
                     </div>
                     <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
@@ -167,16 +167,16 @@
                             价格敏感度 :
                         </div>
                             <c:if test="${clubRemarks.pinceSensitve eq 1}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 2}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">适中</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">适中</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 3}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 4}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
                             </c:if>
 
                         </c:if>
@@ -185,16 +185,16 @@
                             意向程度：
                         </div>
                             <c:if test="${clubRemarks.satisfied eq 1}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 2}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 3}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 4}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
                             </c:if>
 
                         </c:if>
@@ -203,13 +203,13 @@
                             跟进状态：
                         </div>
                             <c:if test="${clubRemarks.followup eq 1}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
                             </c:if>
                             <c:if test="${clubRemarks.followup eq 2}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
                             </c:if>
                             <c:if test="${clubRemarks.followup eq 3}">
-                                <div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
+                                <div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
                             </c:if>
 
                         </c:if>

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

@@ -112,35 +112,35 @@
                     <span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</span>
                 </div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
-					<div style="width: 150px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
+					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
+					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
 					<c:if test="${not empty visitRemarks.clubType}">
-						<div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
 							机构类型：
 						</div>
 						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.clubType}</div>
 					</c:if>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
+					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
 					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.consultType}</div>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<c:if test="${not empty visitRemarks.pinceSensitve}">
-						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 							价格敏感度 :
 						</div>
 						<c:if test="${visitRemarks.pinceSensitve eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">适中</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">适中</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
 						</c:if>
 
 					</c:if>
@@ -149,16 +149,16 @@
 							意向程度：
 						</div>
 						<c:if test="${visitRemarks.satisfied eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
 						</c:if>
 
 					</c:if>
@@ -167,26 +167,26 @@
 							跟进状态：
 						</div>
 						<c:if test="${visitRemarks.followup eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
 						</c:if>
 						<c:if test="${visitRemarks.followup eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
 						</c:if>
 						<c:if test="${visitRemarks.followup eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
+							<div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
 						</c:if>
 
 					</c:if>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>
+					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>
 					<div style="width: 800px;float: left;margin: 10px 0;">
 						${visitRemarks.remarks}
 					</div>
 				</div>
 				<c:if test="${not empty visitRemarks.extra}">
 					<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 							额外说明:
 						</div>
 						<div style="width: 800px;float: left;margin: 10px 0;">