6月小版本

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

@@ -18,7 +18,7 @@ public class NewPageFloor extends DataEntity<NewPageFloor> {
 	private String sort;		// 排序
 	private String wwwEnabledStatus;		// Pc端状态 0停用 1启用
 	private String crmEnabledStatus;// CRM端状态 0停用 1启用
-	private Integer floorType;
+	private Integer floorType;//楼层类别 1，新品楼层
 
 	public Integer getFloorType() {
 		return floorType;

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

@@ -177,6 +177,7 @@ public class NewPageFloorController extends BaseController {
         model.addAttribute("page", list);
         model.addAttribute("date", new Date());
         model.addAttribute("newPageFloor",newPageFloor);
+        model.addAttribute("Product",product);
         return "modules/newhome/newFloorcontentForm";
     }
 
@@ -436,37 +437,30 @@ public class NewPageFloorController extends BaseController {
 
     @RequestMapping(value = "updatshowFlag")
     public String updatshowFlag(Product product) {
-        int num=0;
-        int nums=0;
-if(product.getNewshowTime() !=null && product.getNewshowTime()!=""){
-    num= new Date(product.getShowTime()).compareTo(new Date(product.getNewshowTime()));
-    if(num==-1){
-        product.setShowFlag(2);
-    }
-}else if (product.getAddTime()!=null && product.getAddTime()!=""){
-    nums= new Date(product.getShowTime()).compareTo(new Date(product.getAddTime()));
-    if ( nums==-1){
-        product.setShowFlag(2);
-    }
-}
+
         newPageFloorService.updatshowFlag(product);
         return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor/ContentPage";
     }
 
     @RequestMapping(value = "updateshowTime")
     public String updateshowTime(Product product) {
+        /**
+         * 判断时间更改展示状态
+         */
         newPageFloorService.updateshowTime(product);
         int num=0;
         int nums=0;
         if(product.getNewshowTime() !=null && product.getNewshowTime()!=""){
-            num= new Date(product.getShowTime()).compareTo(new Date(product.getNewshowTime()));
+            num= product.getShowTime().compareTo(product.getNewshowTime());
             if(num>0){
                 product.setShowFlag(1);
-            }
+            }else {product.setShowFlag(2);}
         }else if (product.getAddTime()!=null && product.getAddTime()!=""){
-            nums= new Date(product.getShowTime()).compareTo(new Date(product.getAddTime()));
+            nums= product.getShowTime().compareTo(product.getAddTime());
             if ( nums>0){
                 product.setShowFlag(1);
+            }else {
+                product.setShowFlag(2);
             }
         }
         newPageFloorService.updatshowFlag(product);

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

@@ -99,4 +99,10 @@ public interface CmDiscernReceiptDao extends CrudDao<CmDiscernReceipt> {
     ReceipCouponInfoVo getCouponInfo(String receiptID);
 
     List<NewShopOrder> getShopOrderInfos(@Param("shopOrderId") String shopOrderId,@Param("orderId") String orderId);
+
+    String discern(String id);
+
+    CmDiscernReceipt orderlist(CmDiscernReceipt cmDiscernReceipt);
+
+
 }

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

@@ -70,8 +70,53 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     private Double returnBalanceAmount;// 退款余额金额
     private Integer newReceiptType;//收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划
     private String shopOrderNo;
+    private Integer shopOrderId;//子订单id
+    private Double productAmount;//订单总金额
+    private Double needPayAmount;//应收金额
     private String shopName;
     private String checkMan;
+    private String  shopOrderNos;
+    private String jgName;//机构名称
+
+    public String getJgName() {
+        return jgName;
+    }
+
+    public void setJgName(String jgName) {
+        this.jgName = jgName;
+    }
+
+    public Double getNeedPayAmount() {
+        return needPayAmount;
+    }
+
+    public void setNeedPayAmount(Double needPayAmount) {
+        this.needPayAmount = needPayAmount;
+    }
+
+    public Double getProductAmount() {
+        return productAmount;
+    }
+
+    public void setProductAmount(Double productAmount) {
+        this.productAmount = productAmount;
+    }
+
+    public Integer getShopOrderId() {
+        return shopOrderId;
+    }
+
+    public void setShopOrderId(Integer shopOrderId) {
+        this.shopOrderId = shopOrderId;
+    }
+
+    public String getShopOrderNos() {
+        return shopOrderNos;
+    }
+
+    public void setShopOrderNos(String shopOrderNos) {
+        this.shopOrderNos = shopOrderNos;
+    }
 
     public String getCheckMan() {
         return checkMan;

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

@@ -32,6 +32,15 @@ public class ReceiptDetailVo {
     private ReceiptVipInfoVo vipInfo;// 一个收款关联一个会员记录
     private ReceipCouponInfoVo couponInfo;//优惠券购买记录
     private boolean receiptOrderFlag;// 判断订单中抹平的订单是否是和多个订单一起支付的，
+    private String shopName;
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
 
     public ReceiptVipInfoVo getVipInfo() {
         return vipInfo;

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

@@ -59,9 +59,14 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         return super.get(id);
     }
 
+    public CmDiscernReceipt orderlist(CmDiscernReceipt cmDiscernReceipt) {
+        return cmDiscernReceiptDao.orderlist(cmDiscernReceipt);
+    }
+
     public List<CmDiscernReceipt> findList(CmDiscernReceipt cmDiscernReceipt) {
         return super.findList(cmDiscernReceipt);
     }
+    public String discern(String id){return cmDiscernReceiptDao.discern(id);}
 
     public Page<CmDiscernReceipt> findPage(Page<CmDiscernReceipt> page, CmDiscernReceipt cmDiscernReceipt) {
         Page<CmDiscernReceipt> result = super.findPage(page, cmDiscernReceipt);

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

@@ -99,11 +99,14 @@ public class CmDiscernReceiptController extends BaseController {
             model.addAttribute("endTime", cmDiscernReceipt.getEndTime());
             cmDiscernReceipt.setEndTime(cmDiscernReceipt.getEndTime().trim() + " 23:59:59");
         }
+//        String list=cmDiscernReceiptService.discern(cmDiscernReceipt.getId());
+//        logger.info("+++++++++++++++++"+cmDiscernReceipt.getId());
         Page<CmDiscernReceipt> page = cmDiscernReceiptService.findPage(new Page<CmDiscernReceipt>(request, response), cmDiscernReceipt);
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
+
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
-        //
+//        model.addAttribute("list", list);
         model.addAttribute("page", page);
         return "modules/order/cmDiscernReceiptList";
     }
@@ -140,8 +143,11 @@ public class CmDiscernReceiptController extends BaseController {
     @RequestMapping(value = "detail")
     public String detail(CmDiscernReceipt cmDiscernReceipt, Model model) {
         ReceiptDetailVo vo = cmDiscernReceiptService.detail(cmDiscernReceipt);
+        CmDiscernReceipt op=cmDiscernReceiptService.orderlist(cmDiscernReceipt);
         model.addAttribute("vo", vo);
+        model.addAttribute("op", op);
         model.addAttribute("checkMan",cmDiscernReceipt.getCheckMan());
+
         return "modules/order/cmDiscernReceiptForm";
     }
 

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

@@ -8,6 +8,9 @@ import com.caimei.modules.hehe.entity.CmHeheActivityProduct;
 import com.caimei.modules.hehe.entity.CmHeheCollageProduct;
 import com.caimei.modules.hehe.entity.CmHeheFloorProduct;
 import com.caimei.modules.hehe.entity.CmHeheProduct;
+import com.caimei.modules.newhome.dao.NewPageFloorDao;
+import com.caimei.modules.newhome.entity.NewPageFloorImage;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.dao.CmPromotionDao;
 import com.caimei.modules.product.dao.ProductDao;
 import com.caimei.modules.product.dao.ProductNewDao;
@@ -16,6 +19,7 @@ import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.po.ProductImage;
 import com.caimei.po.ProductLadderPrice;
+import com.caimei.redis.RedisService;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
@@ -24,6 +28,7 @@ import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.sys.entity.User;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,6 +50,10 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
     @Autowired
     ProductNewDao productNewDao;
     @Autowired
+    RedisService redisService;
+    @Autowired
+    GenerateUtils generateUtils;
+    @Autowired
     ProductDao productDao;
     @Autowired
     private CmPromotionDao cmPromotionDao;
@@ -59,8 +68,11 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
     @Autowired
     private CmHeheFloorProductDao cmHeheFloorProductDao;
     @Autowired
+    private NewPageFloorDao newPageFloorDao;
+    @Autowired
     private ProductService productService;
-
+    @Value("${wwwServer}")
+    private String domain;
     @Override
     public Product get(String id) {
         return super.get(id);
@@ -208,8 +220,47 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         product.setBeforeValidFlag(beforeValidFlag);
         product.setNewvalidFlag(newvalidFlag);
         product.setShowTime(showtime);
+
+        NewPageFloorImage floorImage=new NewPageFloorImage();
+        floorImage.setFloorId(productNewDao.newFloorId());
+        floorImage.setImage(product.getMainImage());
+        floorImage.setProductId(productID);
+        floorImage.setShopName(product.getShopName());
+        String link="";
+
+        if(domain.contains("-b")){
+            link="https://www-b.caimei365.com/product-"+productID+".html";
+        }else if(domain.contains("localhost")){
+           link="http://localhost:8081/product-"+productID+".html";
+        }else {
+            link="https://www.caimei365.com/product-"+productID+".html";
+        }
+        floorImage.setLink(link);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String createDate = formatter.format(new Date());
+        floorImage.setCreateDate(createDate);
+        floorImage.setName(product.getName());
+        newPageFloorDao.insertFloorImage(floorImage);
         product.setFloorId( productNewDao.newFloorId());
         productNewDao.updateByPrimaryKeySelective(product);
+        cleanRedisCache();
+
+    }
+    public void cleanRedisCache() {
+        //清除活动专题缓存
+        redisService.removePattern("getPageFloorData*");
+        //清除活动专题缓存
+        redisService.removePattern("activityData*");
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
+        //首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+        // 重新生成静态首页
+
+        generateUtils.generateHome();
 
     }
 

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

@@ -4,6 +4,7 @@ import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.brand.dao.CmBrandDao;
 import com.caimei.modules.brand.entity.CmBrand;
 import com.caimei.modules.common.utils.UploadUtils;
+import com.caimei.modules.newhome.dao.NewPageFloorDao;
 import com.caimei.modules.product.dao.*;
 import com.caimei.modules.product.entity.*;
 import com.caimei.modules.sys.utils.UploadImageUtils;
@@ -45,6 +46,8 @@ public class ProductService extends CrudService<ProductDao, Product> {
     private CmTinytypeDao cmTinytypeDao;
     @Resource
     private ProductNewDao productNewDao;
+    @Autowired
+    NewPageFloorDao newPageFloorDao;
 
     @Override
     public Product get(String id) {
@@ -405,6 +408,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
             if(StringUtils.isNotBlank(product.getCostProportional())){
                 product.setSqlCostProportional(Double.valueOf(product.getCostProportional()));
             }
+            product.setShowFlag(3);
             //保存商品信息
             productDao.insert(product);
             productDetailInfo.setProductID(product.getProductID());
@@ -553,6 +557,21 @@ public class ProductService extends CrudService<ProductDao, Product> {
 
     public Page<Product> newfindProductImage(Page<Product> page, Product product) {
         List<Product> productList = productDao.newfindProductImage(product);
+        int num=0;
+        for (int i=0;i<productList.size();i++){
+            Date currentTime = new Date();
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String dateString = formatter.format(currentTime);
+            num=productList.get(i).getShowTime().compareTo(dateString);
+            if(num<0){
+              product.setShowFlag(2);
+                product.setRecommend(0);
+                product.setProductID(productList.get(i).getProductID());
+                newPageFloorDao.updatshowFlag(product);
+                product.setProductID(null);
+                product.setShowFlag(null);
+            }
+        }
         product.setPage(page);
         page.setList(productList);
         return page;

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

@@ -35,6 +35,7 @@
 		FROM new_page_floor a
 		<include refid="newPageFloorJoins"/>
 		<where>
+			and floorType IS NULL
 			AND delFlag = 0
 		</where>
 		<choose>

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

@@ -60,10 +60,45 @@
         select  IFNULL(sum(amount),0) from cm_user_balance_record where balanceType = 2 and  receiptId = #{receiptId} and delFlag = 0;
     </select>
 
+    <select id="discern" resultType="String">
+        SELECT
+            *
+        FROM cm_shop_order  a
+       LEFT JOIN cm_discern_receipt cso ON cso.shopOrderID = a.shopOrderID
+        WHERE cso.id=#{id}
+    </select>
+
+    <select id="orderlist" resultType="CmDiscernReceipt">
+        SELECT
+            u.userID,
+            csp.id AS receiptID,
+            cms.orderID,
+            cms.shopOrderID,
+            cms.shopOrderNo,
+            cms.orderType as orderType,
+            s.name AS shopName,
+            cms.productAmount,
+            cmo.orderNo,
+            u.userName,
+               u.name AS jgName,
+            cmo.confirmTime,
+            cms.receiptAmount,
+            cms.needPayAmount
+        FROM cm_shop_order cms
+                 LEFT JOIN shop s ON s.shopID = cms.shopID
+                 LEFT JOIN cm_order cmo ON cmo.orderID = cms.orderID
+                 LEFT JOIN `user` u ON u.userID = cms.userID
+                 LEFT JOIN cm_discern_receipt csp ON csp.shopOrderID = cms.shopOrderID
+                   where csp.id=#{id}
+    </select>
+
+
     <select id="findList" resultType="CmDiscernReceipt">
         -- 	relationType值为1是为子订单ID,为2时为主订单ID）
         SELECT
         <include refid="cmDiscernReceiptColumns"/>,
+        cso.orderID as orderID,
+        cso_s.shopOrderNo as shopOrderNos,
         cso.shopOrderNo,
           s.checkMan,
         s.name AS shopName,
@@ -85,6 +120,7 @@
         LEFT JOIN USER u_cr ON u_cr.userID = cso_cr.userID
             -- 供应商
         LEFT JOIN shop s ON s.shopID = cso.shopID
+        LEFT JOIN cm_shop_order cso_s ON cso_s.shopOrderID = a.shopOrderID
         <where>
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
@@ -557,7 +593,8 @@
 	    cdr.cancelReason AS cancelReason,
 	    cdr.payWay AS payWay,
 	    rup.name AS confirmer,
-	    cdr.rebateRemarks AS rebateRemarks
+	    cdr.rebateRemarks AS rebateRemarks,
+        cdr.shopName as shopName
 	    from
 		cm_discern_receipt cdr
 		left join receipt_user_permission rup on cdr.confirmUserPermissionID = rup.id

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

@@ -404,7 +404,8 @@
                             splitCode,
                             productDetail,
                             announType,
-							newProductType)
+							newProductType,
+							showFlag)
         VALUES (#{brandID},
                 #{bigTypeID},
                 #{smallTypeID},
@@ -479,7 +480,8 @@
                 #{splitCode},
                 #{productDetail},
                 #{announType},
-                #{newProductType})
+                #{newProductType},
+                #{showFlag})
     </insert>
 
     <update id="update">

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

@@ -691,6 +691,9 @@
         <if test="newvalidFlag == 1">
             showFlag=1
         </if>
+            <if test="newvalidFlag == 2">
+                showFlag=4
+            </if>
         </set>
         where productID = #{productID}
     </update>

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

@@ -1,5 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <html>
 <head>
 	<title>固定楼层内容管理</title>
@@ -45,8 +47,30 @@
             },{buttonsFocus:1,persistent: true});
         }
 
+		function dateFormat(fmt, date) {
+			let ret;
+			const opt = {
+				"Y+": date.getFullYear().toString(),        // 年
+				"m+": (date.getMonth() + 1).toString(),     // 月
+				"d+": date.getDate().toString(),            // 日
+				"H+": date.getHours().toString(),           // 时
+				"M+": date.getMinutes().toString(),         // 分
+				"S+": date.getSeconds().toString()          // 秒
+				// 有其他格式化字符需求可以继续添加，必须转化成字符串
+			};
+			for (let k in opt) {
+				ret = new RegExp("(" + k + ")").exec(fmt);
+				if (ret) {
+					fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+				};
+			};
+			return fmt;
+		}
+
+
 
-        //CRM端状态修改
+
+		//CRM端状态修改
         function updateCrmEnabledStatusByIds(status,ids){
             var msg='确定启用该楼层吗？';
             if('0'==status){
@@ -78,8 +102,10 @@
 		function offoce(productID,date,newshowTime,ShowTime,addTime){
 			var html = "<div id='auditBox'>"
 					+ "<div class='bd-row'>"
+					+ "<span style='margin-left: 5px;size: 30px'>更改时间后，将从此刻的时间开始重新计算</span>"
+					+ "<br>"
 					+ "    <span><font color='red'>*</font>展示时间：</span>"
-					+ "   <input type='text' name='yat'/>"
+					+ "   <input type='text' onkeyup='onlynum(this)' class='input-mini' name='yat'/>"
 					+ "<span>天</span>"
 					+ "</div>"
 					+ "<span  id='err' hidden=hidden style='color: red'>请输入天数</span>"
@@ -105,12 +131,15 @@ debugger
 				var s=time.getSeconds();
 				d=time.getTime()+1000*60*60*24*f.yat;
 				var unixTimestamp = new Date(d);
-				commonTime = unixTimestamp.toLocaleString()
+				commonTime =dateFormat("YYYY-mm-dd HH:MM:SS",unixTimestamp);
 
 				var data=new Date(date);
 				data.getTime()+1000*60*60*24;
 				var dtime = new Date(data);
-				commTime = dtime.toLocaleString()
+				commTime = dateFormat("YYYY-mm-dd HH:MM:SS",dtime);
+
+
+
 
 				// d=time.setDate(Number(d) + Number(f.yat)).toLocaleString().replace(/\//g, "-");
 
@@ -139,14 +168,12 @@ debugger
 			$items.each(function(){
 				items.push($(this).val());
 			});
+			debugger
 			//保存批量排序
 			$.post("${ctx}/newhome/newPageFloor/batchSavesortIndex?sortList="+items, function(data) {
-				if(true==data.success){
-					$.jBox.tip(data.msg, 'info');
-					window.location.href = "${ctx}/newhome/newPageFloor/ContentPage";
-				} else {
-					$.jBox.tip(data.msg,'error');
-				}
+
+					window.location.href = "${ctx}/newhome/newPageFloor/ContentPage?floorId=${newPageFloor.id}&floorTitle=${newPageFloor.floorTitle}&floorType=${newPageFloor.floorType}";
+
 			},"JSON");//这里返回的类型有：json,html,xml,text
 		}
 
@@ -168,7 +195,7 @@ debugger
 			console.log(newshowTime)
 			$.jBox.confirm("确定下线该商品吗？下线后该商品将不展示在商城新品区域","提示",function(v,h,f){
 				if(v === 1){
-					window.location.href="${ctx}/newhome/newPageFloor/updatshowFlag?showFlag=3&productID="+productID+"&newshowTime="+newshowTime+"&ShowTime="+ShowTime+"&addTime"+addTime;
+					window.location.href="${ctx}/newhome/newPageFloor/updatshowFlag?showFlag=5&productID="+productID+"&newshowTime="+newshowTime+"&ShowTime="+ShowTime+"&addTime"+addTime;
 				}
 			} ,{ buttons: {  '确定': 1,'取消':2}});
 		}
@@ -194,28 +221,33 @@ debugger
 		<li><a href="${ctx}/newhome/newPageFloor/lists">固定楼层管理列表</a></li>
 		<li class="active"><a href="${ctx}/newhome/newPageFloor/ContentPage?floorId=${newPageFloor.id}&floorTitle=${newPageFloor.floorTitle}&floorType=${newPageFloor.floorType}">内容</a></li>
 	</ul>
-	<form:form id="searchForm" modelAttribute="" action="${ctx}/newhome/newPageFloor/ContentPage" class="breadcrumb form-search">
+	<form:form id="searchForm" modelAttribute="Product" action="${ctx}/newhome/newPageFloor/ContentPage?floorId=${newPageFloor.id}&floorTitle=${newPageFloor.floorTitle}&floorType=${newPageFloor.floorType}">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		楼层名称:&nbsp;<span style="color: #0bbbee">${newPageFloor.floorTitle}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span >楼层类型:</span>&nbsp;<span style="color: #0bbbee"><c:if test="${newPageFloor.floorType eq 1}">新品橱窗</c:if></span>
 		<div class="ul-form">
 
 			<label>商品ID：</label>
-			<input name="productID" path="productID" maxlength="50" class="input-medium"/>
+			<form:input path="productID" onkeyup="onlynum(this)" name="productID" maxlength="50" class="input-medium"/>
 			<label>商品名称：</label>
-			<input name="name" path="name" maxlength="50" class="input-medium"/>
+			<form:input path="name" name="name" maxlength="50" class="input-medium"/>
 			<label>供应商：</label>
-			<input name="shopName"  path="shopName" maxlength="50" class="input-medium"/>
+			<form:input path="shopName" name="shopName" maxlength="50" class="input-medium"/>
 			<label>展示状态：</label>
-			<select name="showFlag" class="input-medium">
-				<option selected value="0">请选择</option>
-				<option value="1">已展示</option>
-				<option value="2">已下线</option>
-				<option value="3">展示过期</option>
-			</select>
-			<input class="btn btn-primary" style="width: 70px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
+			<form:select path="showFlag" class="input-small">
+				<form:option  value="0">请选择</form:option>
+				<form:option value="1">已展示</form:option>
+				<form:option value="2">展示过期</form:option>
+				<form:option value="3">未参与</form:option>
+				<form:option value="4">审核未通过</form:option>
+				<form:option value="5">已下线</form:option>
+			</form:select>
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			楼层名称:&nbsp;<span>${newPageFloor.floorTitle}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>楼层类型:&nbsp;<c:if test="${newPageFloor.floorType eq 1}">新品橱窗</c:if></span>
+			<input class="btn btn-primary" style="width:  70px" onclick="batchSaveSort()"  value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
+
+
 		</div>
+
 	</form:form>
 
 	<sys:message content="${message}"/>
@@ -248,9 +280,15 @@ debugger
 						<font color="#ff8c00">展示过期</font>
 					</c:if>
 					<c:if test="${list.showFlag eq 3}">
+						<font color="red">未参与</font>
+					</c:if>
+					<c:if test="${list.showFlag eq 4}">
+						<font color="red">审核未通过</font>
+					</c:if>
+					<c:if test="${list.showFlag eq 5}">
 						<font color="red">已下线</font>
-					</c:if></td>
-
+					</c:if>
+				</td>
 				<td>
 					<c:if test="${not empty list.newshowTime}">
 					${list.newshowTime}~${list.showTime}
@@ -270,10 +308,10 @@ debugger
 					<c:if test="${list.recommend eq 1}"><img src="/static/images/yes.gif" width="15px" border="none"/></c:if>
 				</td>
 				<td>
-					<c:if test="${list.showFlag eq 3}"><a class="red" href="javascript:void(0);" onclick="offocea(${list.productID},'${list.newshowTime}','${list.showTime}','${list.addTime}')">上线商品</a></c:if>
+					<c:if test="${list.showFlag eq 5}"><a class="red" href="javascript:void(0);" onclick="offocea(${list.productID},'${list.newshowTime}','${list.showTime}','${list.addTime}')">上线商品</a></c:if>
 					<c:if test="${list.showFlag eq 1 }"><a class="red" href="javascript:void(0);" onclick="offoceb(${list.productID},'${list.newshowTime}','${list.showTime}','${list.addTime}')">下线商品</a>	</c:if>
 					<c:if test="${list.recommend eq 1}"><a class="red" href="javascript:void(0);" onclick="offocec(${list.productID})">取消重点推荐</a> </c:if>
-					<c:if test="${list.recommend != 1 && count<=5 && list.showFlag != 4}"><a class="red" href="javascript:void(0);" onclick="offoced(${list.productID})">设为重点推荐</a></c:if>
+					<c:if test="${list.recommend != 1 && count<5 && list.showFlag != 5}"><a class="red" href="javascript:void(0);" onclick="offoced(${list.productID})">设为重点推荐</a></c:if>
 		          <a class="red" href="javascript:void(0);" onclick="offoce(${list.productID},new Date,'${list.newshowTime}','${list.addTime}')">更改展示时间</a>
                </td>
 </c:forEach>

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

@@ -54,7 +54,7 @@
                         } else {
                             $.jBox.tip(data.msg,'error');
                         }
-                        window.location = "${ctx}/newhome/newPageFloor/";
+                        window.location = "${ctx}/newhome/newPageFloor/lists";
                     },"JSON");//这里返回的类型有：json,html,xml,text
                 }
                 return;

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

@@ -228,8 +228,8 @@
                 <span><label>确认人:</label> ${vo.confirmer}</span>
                 <span><label>确认时间: </label>${vo.confirmTime}</span>
                 <br>
-                <c:if test="${cmDiscernReceipt.newReceiptType != 4 && cmDiscernReceipt.shopName != null}"> <span class="not-order-reason"><label>关联供应商：</label>${cmDiscernReceipt.shopName}</span></c:if>
-                <c:if test="${cmDiscernReceipt.newReceiptType eq 4 || cmDiscernReceipt.shopName == null}"> <span class="not-order-reason"><label>关联供应商：</label>无</span></c:if>
+                <c:if test="${ vo.shopName != null && cmDiscernReceipt.newReceiptType != 2 }"> <span class="not-order-reason"><label>关联供应商：</label>${vo.shopName}</span></c:if>
+                <c:if test="${vo.shopName == null && cmDiscernReceipt.newReceiptType != 2}"> <span class="not-order-reason"><label>关联供应商：</label>无</span></c:if>
                 <br>
                 <c:if test="${not empty vo.noOrderReason}">
                     <span class="not-order-reason"><label>备注信息：</label>${vo.noOrderReason}</span>
@@ -238,7 +238,123 @@
             </div>
         </c:if>
     </div>
-    <c:if test="${cmDiscernReceipt.newReceiptType eq 2 or vo.receiptType != 2 and vo.receiptType != 6 and vo.receiptType != 7 and vo.receiptType != 8}">
+    <c:if test="${cmDiscernReceipt.newReceiptType eq 2}">
+        <h5>关联订单</h5>
+            <div class="receipt-order-form">
+                <div class="receipt-order-row2">
+                        <span class="font-blue"><label>子订单编号：</label>
+                               <a href="${ctx}/order/detail?id=${op.orderID}">${op.shopOrderNo}（${op.shopOrderId}）</a></span>
+                    <span><label>订单金额：</label>¥<fmt:formatNumber
+                            value="${op.productAmount}"
+                            pattern="#0.00"/></span>
+                    <span>
+                         <span><label>供应商：</label>${op.shopName}</span>
+                    <span>
+                </div>
+                <div class="receipt-order-row3">
+
+                         <span class="font-blue"><label>订单编号：</label><a
+                                 href="${ctx}/order/detail?id=${op.orderID}">${op.orderNo}（${op.orderID}）</a></span>
+
+                        <span><label>订单金额：</label>¥<fmt:formatNumber
+                                value="${op.productAmount}"
+                                pattern="#0.00"/></span>
+
+                            <span><label>应收金额：</label>¥<fmt:formatNumber value="${op.needPayAmount}"
+                                                                         pattern="#0.00"/></span>
+                            <span>
+                            <label>已收金额：</label>¥<fmt:formatNumber
+                                    value="${empty op.receiptAmount ? 0 : op.receiptAmount}"
+                                    pattern="#0.00"/>
+                            </span>
+                    <span><label>机构名称：</label>${op.jgName}</span>
+                    <br>
+                    <span><label>订单类型：</label><c:if test="${op.orderType eq 0}">普通订单</c:if>
+                    <c:if test="${op.orderType eq 1}">协销订单</c:if>
+                    </span>
+                    <span><label>下单日期：</label>${cmDiscernReceipt.confirmDate}</span>
+
+                </div>
+            </div>
+        <div class="receipt-order-row4">
+            <div><h5><label>订单收款记录：</label></h5></div>
+            <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
+                <div class="row4-wrapper">
+                    <span class="row4-order-no">${index.index + 1}、</span>
+                    <span class="row4-time">${receiptRecord.receiptTime}</span>
+                    <c:if test="${receiptRecord.payWay == 1}">
+                        <%--线上收款--%>
+                        <span>线上&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                        <span>${receiptRecord.receiptAmount}</span>
+                        <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                    </c:if>
+                    <c:if test="${receiptRecord.payWay == 2}">
+                        <span>线下&nbsp;${fns:getPayTypeStr(receiptRecord.payType)}</span>
+                        <span>${receiptRecord.receiptAmount}</span>
+                        <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
+                            <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                        </c:if>
+                        <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
+                                    <span>
+                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
+                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
+                                        </c:if>
+                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
+                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
+                                        </c:if>
+                                    </span>
+                        </c:if>
+                    </c:if>
+                    <c:if test="${receiptRecord.payWay == 3}">
+                        <%--余额抵扣--%>
+                        <span><a
+                                href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
+                        <span><a
+                                href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
+                    </c:if>
+                    <span>
+    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
+                                <c:if test="${!vo.receiptOrderFlag}">
+                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
+                                        <label>抹平明细：</label>
+                                        <c:if test="${receiptRecord.confirmType eq 1}">
+                                                <font color="red">(少收抹平:
+                                                    ￥<fmt:formatNumber
+                                                            value="${orderInfo.payableAmount - (empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount)}"
+                                                            pattern="#0.00"/>元)
+                                                </font>
+                                        </c:if>
+                                        <c:if test="${receiptRecord.confirmType eq 2}">
+                                                <font color="red">(多收抹平:
+                                                    ￥<fmt:formatNumber
+                                                            value="${(empty receiptRecord.orderReceivedAmount ? 0 : receiptRecord.orderReceivedAmount) - orderInfo.payableAmount}"
+                                                            pattern="#0.00"/>元)
+                                                </font>
+                                        </c:if>
+                                        <c:if test="${receiptRecord.confirmType eq 3}">
+                                                <font color="red">(多收退余额${receiptRecord.associationType eq 2 ? "(自动)" : ""}:
+                                                    ￥<fmt:formatNumber
+                                                            value="${(empty receiptRecord.returnBalanceAmount ? 0 : receiptRecord.returnBalanceAmount)}"
+                                                            pattern="#0.00"/>元)
+                                                </font>
+                                        </c:if>
+                                    </c:if>
+                                </c:if>
+                                </span>
+                    <span>
+                                    ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}
+                                </span>
+                </div>
+            </c:forEach>
+        </div>
+    </c:if>
+
+
+
+
+    <c:if test="${vo.receiptType != 2 and vo.receiptType != 6 and vo.receiptType != 7 and vo.receiptType != 8}">
         <h5>关联订单</h5>
         <div class="receipt-order-form">
             <c:forEach items="${vo.orderInfos}" var="orderInfo">
@@ -257,6 +373,7 @@
                                                                              pattern="#0.00"/></span>
                                 <span><label>已退金额：</label>¥<fmt:formatNumber value="${orderInfo.refundsAmount}"
                                                                              pattern="#0.00"/></span>
+
                             </c:if>
                         </div>
                     </c:if>
@@ -273,6 +390,7 @@
                             <label>已收金额：</label>¥<fmt:formatNumber
                                     value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
                                     pattern="#0.00"/>
+
                             <span>
                                     <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord"
                                                varStatus="index">

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

@@ -300,8 +300,9 @@
                 <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
             </td>
-            <td>
-                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.shopOrderNo}</c:if>
+           <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
+                <c:if test="${cmDiscernReceipt.newReceiptType eq 2}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}（${cmDiscernReceipt.shopOrderId}）</a></c:if>
+                <c:if test="${cmDiscernReceipt.receiptType != 6 && cmDiscernReceipt.newReceiptType != 2}">${cmDiscernReceipt.orders}</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>

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

@@ -744,15 +744,28 @@
             </td>
         </tr>
         <tr>
+
             <th><span class="red">*</span>首页新品展示：</th>
             <td colspan="3">
-                <label><input type="radio" name="newProductType" value="1"
-                              ${product.newProductType == "1" ? "checked" : ""}>参与新品展示<b
-                        class="line">|</b></label>
-                <label><input type="radio" name="newProductType" value="2"
-                             ${product.newProductType == "2" ? "" : "checked"}>不参与新品展示</label>
+            <c:if test="${product.newProductType==1}">
+                <input type="radio" checked="checked" name="newProductType" value="1" class="required" />参与新品展示
+                <input type="radio" name="newProductType" value="2" class="required" />不参与新品展示
+            </c:if>
+            <c:if test="${empty product.newProductType || product.newProductType==2}">
+                <input type="radio" name="newProductType" value="1" class="required" />参与新品展示
+                <input type="radio" checked="checked" name="newProductType" value="2" class="required" />不参与新品展示
+            </c:if>
             </td>
+<%--            <td colspan="3">--%>
+<%--                <label><input type="radio" name="newProductType" value="1"--%>
+<%--                              ${product.newProductType == "1" ? "checked" : ""}>参与新品展示<b--%>
+<%--                        class="line">|</b></label>--%>
+<%--                <label><input type="radio" name="newProductType" value="2"--%>
+<%--                             ${product.newProductType == "2" ? "" : "checked"}>不参与新品展示</label>--%>
+<%--            </td>--%>
         </tr>
+
+
         <tr>
             <th>商品说明：</th>
             <td colspan="3">

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

@@ -165,7 +165,7 @@
 				<th>商品可见度</th>
 				<th>价格可见度</th>
 				<th>线上分帐号</th>
-				<th>状态</th>
+				<th>商品状态</th>
 				<th>新品参与状态</th>
 				<th>新品审核状态</th>
 				<th>提交时间</th>
@@ -278,7 +278,7 @@
 						<font color="darkorange">未参与</font>
 					</c:if>
 					<c:if test="${product.newProductType eq null}">
-						<font color="red">___</font>
+						<font color="red">未参与</font>
 					</c:if>
 					<c:if test="${product.newProductType eq 1}">
 						<font color="darkorange">参与</font>
@@ -344,9 +344,9 @@
                                 <a href="javascript:;" onclick="jumpHref('${ctx}/product/new/imageList?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">图片管理</a>
                                 <a href="javascript:;" onclick="jumpHref('${ctx}/product/hehe/edit?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}')">参与呵呵商城</a><br>
                                 <c:if test="${product.validFlag eq 1 or product.validFlag eq 8}">
-									<c:if test="${(product.newProductType != 1 || product.newProductType eq null)}"> <a class="red" href="javascript:void(0);" onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">上架审核</a></c:if>
+									 <a class="red" href="javascript:void(0);" onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">上架审核</a>
                                 </c:if>
-								<c:if test="${product.newProductType eq 1 ||  product.newvalidFlag != 1}"><a class="red" href="javascript:void(0);" onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
+								<c:if test="${product.newProductType eq 1 &&  product.newvalidFlag != 1 && product.validFlag == 2}"><a class="red" href="javascript:void(0);" onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
                                 <c:if test="${product.validFlag ne 10 && product.validFlag ne 1 && product.validFlag ne 8}">
                                     <a class="red" href="javascript:void(0);" onclick="validChange(${product.id}, 10)">冻结</a>
                                 </c:if>
@@ -593,22 +593,17 @@
 				+ "<div class='bd-row'>"
 				+ "    <span><font color='red'>*</font>商品上架审核：</span>"
 				+ "    <select name='validFlag' id='validFlag'>"
-				+ "        <option value=''>请选择</option>"
 				+ "        <option value='2'>审核通过</option>"
 				+ "        <option value='8'>审核未通过</option>"
 				+ "    <select/>"
 				+ "</div>"
 		         + "</div>";
         var html = "<div id='auditBox'>"
-				+ "<div class='bd-row'>"
-				+ "    <span><font color='red'>*</font>新品展示审核：</span>"
-				+ "    <select name='newvalidFlag' id='newvalidFlag'>"
-				+ "        <option value=''>请选择</option>"
+				+ "   <span><font color='red'>*</font>新品展示审核：</span>  "
+				+ "  <select name='newvalidFlag' id='newvalidFlag'> "
 				+ "        <option value='1'>审核通过</option>"
 				+ "        <option value='2'>审核未通过</option>"
 				+ "    <select/> "
-				+ "</div>"
-				+ "    <span id='err' hidden=hidden style='color: red'>请选择审核结果</span>"
 				 + "</div>";
 
         var submit = function (v, h, f) {
@@ -629,8 +624,10 @@
 			commTime = dtime.toLocaleString()
 			if(validFlag == 2 && newProductType == 1){
 				f.validFlag=validFlag;
-				console.log("t"+f.validFlag)
+
 			}
+			console.log(f.newvalidFlag)
+			console.log("t"+f.validFlag)
             $.post("${ctx}/product/new/auditProduct", {
             	'productID': id,
                 'validFlag': f.validFlag,