初始化

WebContent/static/mobile/js/cutProductDetail.js

@@ -280,19 +280,21 @@ function getCutInfo(){
                     $(".time").html("减价剩余<span class='time-tip'>"+days+"</span>天<span class='time-tip'>" + hours+"</span>小时" +
                         "<span class='time-tip'>" + minutes+"</span>分<span class='time-tip'>"+seconds+"</span>秒");
                 }, 1000);
-                if (data.myCutInfo.id==data.cutInfo.id){
-                    $(".btns").append('<div class="mui-btn mui-btn-primary ml10 cut">自己减价</div>');
-                    $(".btns").append('<div class="mui-btn mui-btn-primary ml10 yaoqing">邀请好友减价</div>');
-                    $(".btns").append('<div class="mui-btn mui-btn-primary ml10 buy">立即购买</div>');
-                }else{
-                	if(!data.myCutInfo){
-                        $(".btns").append('<div class="mui-btn mui-btn-primary ml10 cut">帮好友减价</div>');
-                        $(".btns").append('<div class="mui-btn mui-btn-primary ml10 baoming">我要报名</div>');
-					}else{
+
+				if(data.myCutInfo&&data.myCutInfo!=null){
+                    if (data.myCutInfo.id==data.cutInfo.id){
+                        $(".btns").append('<div class="mui-btn mui-btn-primary ml10 cut">自己减价</div>');
+                        $(".btns").append('<div class="mui-btn mui-btn-primary ml10 yaoqing">邀请好友减价</div>');
+                        $(".btns").append('<div class="mui-btn mui-btn-primary ml10 buy">立即购买</div>');
+                    }else{
                         $(".btns").append('<div class="mui-btn mui-btn-primary ml10 cut">帮好友减价</div>');
                         $(".btns").append('<div class="mui-btn mui-btn-primary ml10 my">去我的减价>></div>');
-					}
-                }
+                    }
+				}else{
+                    $(".btns").append('<div class="mui-btn mui-btn-primary ml10 cut">帮好友减价</div>');
+                    $(".btns").append('<div class="mui-btn mui-btn-primary ml10 baoming">我要报名</div>');
+				}
+
             }else if(data.time_status==1){
                 $(".time").html("已抢完");
                 $(".btns").append('<div class="mui-btn mui-btn-primary ml10 qita">活动已经抢光，查询其他活动>></div>');

WebContent/static/web/js/user/refundOrderList.js

@@ -3,6 +3,13 @@ var num=web.getUrlVars("num");
 layui.define(['laydate', 'layer', 'form','element'], function (exports) {
     var $ = layui.jquery,layer = layui.layer,form = layui.form,laydate = layui.laydate,element = layui.element;
     web.daterange(laydate,"startCreateTime","endCreateTime");
+    $("#merchant_name").on('click', function () {
+        top.web.popWin(base+"/web/merchant/merchantWin.jsp","选择商户",600,432,function(res){
+            $("#merchant_id").val(res.id);
+            $("#merchant_name").val(res.merchant_name);
+        });
+        return false;
+    });
     var table1 = $('#dateTable1').DataTable({
         ajax: {  
             url: base+"/userOrder/query",
@@ -10,7 +17,8 @@ layui.define(['laydate', 'layer', 'form','element'], function (exports) {
                 data.startCreateTime = $.trim($("#startCreateTime").val());
                 data.endCreateTime = $("#endCreateTime").val();
                 data.orderStatus = "6";
-            }   
+                data.merchant_id = $("#merchant_id").val();
+            }
         }, 
         "columns": [                            // 自定义数据列
         	{data:function(obj){

WebContent/web/user/refundOrderList.jsp

@@ -23,6 +23,12 @@
 		           		<input type="text" id="endCreateTime" name="endCreateTime" autocomplete="off" 
 		           			placeholder="结束时间" class="layui-input layui-col-xs7">
 					</div>
+					<div class="layui-col-xs2_4">
+						<label class="layui-form-label layui-col-xs4">商户名称</label>
+                        <input type="hidden" id="merchant_id" name="merchant_id">
+                        <input type="text" id="merchant_name" name="merchant_name"
+                               autocomplete="off" placeholder="请选择商户" class="layui-input layui-col-xs7 popup">
+					</div>
 					<div class="layui-col-xs2_4 f0"> 
 			        	<button class="layui-btn layui-btn-small" id="btn-query1"><i class="layui-icon">&#xe604;</i>查询</button>
 			        	<button class="layui-btn layui-btn-small layui-btn-primary" type="reset" id="btn-reset">重置</button>

src/com/mall/controller/product/CutDetailController.java

@@ -3,12 +3,16 @@ package com.mall.controller.product;
 
 import com.jfinal.aop.Before;
 import com.jfinal.ext.interceptor.POST;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Record;
 import com.mall.controller.common.BaseController;
 import com.mall.model.product.CutDetail;
 import com.mall.model.product.CutInfo;
 import com.mall.model.product.Product;
 import com.mall.model.user.UserOrder;
 import com.mall.util.Ret;
+import com.mall.util.TemplateMsg;
+import com.sun.prism.impl.Disposer;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -56,6 +60,9 @@ public class CutDetailController extends BaseController{
         if(cutInfo.getBigDecimal("product_price").doubleValue()-price<=product.getBigDecimal("product_price").doubleValue()){
             price = cutInfo.getBigDecimal("product_price").doubleValue() - product.getBigDecimal("product_price").doubleValue();
             cutInfo.set("product_price",product.getBigDecimal("product_price").doubleValue());
+            Record r = product.toRecord();
+            r.set("url", PropKit.get("siteUrl")+"/mobile/cutProductDetail.jsp?id="+product.get("id")+"&cutId="+cutId);
+            TemplateMsg.sendMsg10(r, cutInfo.getStr("openid"));
         }else{
             cutInfo.set("product_price",cutInfo.getBigDecimal("product_price").doubleValue()-price);
         }

src/com/mall/controller/product/ProductController.java

@@ -276,7 +276,7 @@ public class ProductController extends BaseController{
             model.set("myCutInfo",CutInfo.dao.getCutInfo(id,openid));
             model.set("cutInfo",cutInfo);
             model.set("cutDetail", CutDetail.dao.getDetaiList(cutId));
-            model.set("user", Users.dao.getByOpenid(openid));
+            model.set("user", Users.dao.getByOpenid(cutInfo.getStr("openid")));
         }
         ret.setData(model);
         renderJson(ret);

src/com/mall/controller/user/UserOrderController.java

@@ -465,15 +465,17 @@ public class UserOrderController extends BaseController{
 						//分销
 						if(StringUtils.isNotEmpty(record.getStr("share_user"))){
 							Record product  = UserOrderDetail.dao.getProduct(record.getInt("id"));
-							if(product.getBigDecimal("share_price").compareTo(new BigDecimal("0"))>0) {
-								UserMoney userMoney = new UserMoney();
-								userMoney.set("openid", record.getStr("share_user"));
-								userMoney.set("order_no", out_trade_no);
-								userMoney.set("type", "40");//佣金
-								userMoney.set("money", product.getBigDecimal("share_price"));
-								userMoney.set("status", "1");
-								userMoney.set("create_time", new Date());
-								userMoney.save();
+							if(product.get("share_price")!=null) {
+								if (product.getBigDecimal("share_price").compareTo(new BigDecimal("0")) > 0) {
+									UserMoney userMoney = new UserMoney();
+									userMoney.set("openid", record.getStr("share_user"));
+									userMoney.set("order_no", out_trade_no);
+									userMoney.set("type", "40");//佣金
+									userMoney.set("money", product.getBigDecimal("share_price"));
+									userMoney.set("status", "1");
+									userMoney.set("create_time", new Date());
+									userMoney.save();
+								}
 							}
 						}
 						//消息通知

src/com/mall/model/user/UserOrder.java

@@ -110,6 +110,11 @@ public class UserOrder extends Model<UserOrder>
 				sql.append(" and date(a.refund_time) <= ? ");
 				param.add(params.get("endCreateTime"));
 			}
+
+			if(Utility.isNotEmpty(params.get("merchant_id"))){
+				sql.append(" and b.merchant_id = ? ");
+				param.add(params.get("merchant_id"));
+			}
 		}
     	
     	sql.append(" order by a.create_time desc");

src/com/mall/util/TemplateMsg.java

@@ -237,4 +237,28 @@ public class TemplateMsg {
 			"}";
 		TemplateMsgApi.send(param);
     }
+	/**
+	 *
+	 * @Description: 减价到底通知
+	 * @author zhengwei  
+	 * @date 2016年12月5日 下午5:06:00
+	 * @param Record
+	 * @return
+	 */
+	public static void sendMsg10(Record record,String openid){
+		String param="{"+
+	        "\"touser\":\""+openid+"\","+
+	        "\"template_id\":\"MCNwxavUrk7mzptuxkW2XXELP6pK98PdBpGMJY0dJmc\","+
+	        "\"topcolor\":\"#FF0000\","+
+			"\"url\":\""+record.getStr("url")+"\","+
+	        "\"data\":{"+
+                "\"first\": {\"value\":\"您的订单已经减到低价\"},"+
+                "\"keyword1\": {\"value\":\""+System.currentTimeMillis()+"\"},"+
+                "\"keyword2\": {\"value\":\""+record.getStr("product_name")+"\"},"+
+                "\"keyword3\": {\"value\":\"减至低价\"},"+
+                "\"remark\":{\"value\":\"数量有限，请抓紧时间购买\",\"color\":\"#22b1ff\"}"+
+                "}"+
+			"}";
+		TemplateMsgApi.send(param);
+    }
 }