Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/apparatus/Apparatus.java

@@ -0,0 +1,70 @@
+package com.iamberry.wechat.core.entity.apparatus;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+import java.util.Date;
+
+/**
+ * 机器实体类
+ * Created by liuzhiwei on 2017/12/28.
+ */
+public class Apparatus implements java.io.Serializable{
+
+    private static final long serialVersionUID = -6012485654579010515L;
+
+    private Integer apparatusId;        //id
+    private String apparatusBarcode;    //机器条码
+    private String userOpenid;          //用户openid
+    private Integer apparatusStatus;    //状态
+    private Date apparatusCreateTime;   //创建时间
+
+    private PageBean page;			//分页
+
+    public PageBean getPage() {
+        return page;
+    }
+
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
+
+    public Integer getApparatusId() {
+        return apparatusId;
+    }
+
+    public void setApparatusId(Integer apparatusId) {
+        this.apparatusId = apparatusId;
+    }
+
+    public String getApparatusBarcode() {
+        return apparatusBarcode;
+    }
+
+    public void setApparatusBarcode(String apparatusBarcode) {
+        this.apparatusBarcode = apparatusBarcode;
+    }
+
+    public String getUserOpenid() {
+        return userOpenid;
+    }
+
+    public void setUserOpenid(String userOpenid) {
+        this.userOpenid = userOpenid;
+    }
+
+    public Integer getApparatusStatus() {
+        return apparatusStatus;
+    }
+
+    public void setApparatusStatus(Integer apparatusStatus) {
+        this.apparatusStatus = apparatusStatus;
+    }
+
+    public Date getApparatusCreateTime() {
+        return apparatusCreateTime;
+    }
+
+    public void setApparatusCreateTime(Date apparatusCreateTime) {
+        this.apparatusCreateTime = apparatusCreateTime;
+    }
+}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/apparatus/ApparatusService.java

@@ -0,0 +1,18 @@
+package com.iamberry.wechat.face.apparatus;
+
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2017/12/28.
+ */
+public interface ApparatusService {
+
+    /**
+     * 分页查询机器列表
+     * @param apparatus
+     * @return
+     */
+    List<Apparatus> listApparatusPage(Apparatus apparatus);
+}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -102,4 +102,11 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -0,0 +1,24 @@
+package com.iamberry.wechat.service.apparatus;
+
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.service.mapper.ApparatusMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/12/28.
+ */
+@Service
+public class ApparatusServiceImpl implements ApparatusService {
+
+    @Autowired
+    private ApparatusMapper apparatusMapper;
+
+    @Override
+    public List<Apparatus> listApparatusPage(Apparatus apparatus) {
+        return apparatusMapper.listApparatusPage(apparatus);
+    }
+}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/ProductInfoServiceImpl.java

@@ -126,4 +126,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	public ProductColor getProductColor(ProductColor productColor){
 		return productInfoDao.getProductColor(productColor);
 	}
+
+	@Override
+	public List<ProductColor> selectColorList(Integer colorProductId) {
+		return productInfoDao.selectColorList(colorProductId);
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/ProductInfoDao.java

@@ -98,4 +98,11 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/ProductInfoDaoImpl.java

@@ -107,4 +107,9 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
     public Integer updateGiftStatus(QrcodeGift qrcodeGift) {
         return productInfoMapper.updateGiftStatus(qrcodeGift);
     }
+
+	@Override
+	public List<ProductColor> selectColorList(Integer colorProductId) {
+		return productInfoMapper.selectColorList(colorProductId);
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ApparatusMapper.java

@@ -0,0 +1,18 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/12/28.
+ */
+public interface ApparatusMapper {
+
+    /**
+     * 分页查询机器列表
+     * @param apparatus
+     * @return
+     */
+    List<Apparatus> listApparatusPage(Apparatus apparatus);
+}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductInfoMapper.java

@@ -47,7 +47,7 @@ public interface ProductInfoMapper {
 	
 	/**
 	 * 根据商品id查询礼品信息
-	 * @param userProductId
+	 * @param userGiftDto
 	 * @return
 	 */
 	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
@@ -100,4 +100,11 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -373,8 +373,10 @@ PUBLIC
 	     SET 
 	          PLACE_AMOUNT =(PLACE_AMOUNT + #{amount}) 
 	      WHERE 
-	     	PLACE_ID = #{id} 
-     </update>
+	     	PLACE_ID = #{id}
+	      AND
+	      	<![CDATA[PLACE_AMOUNT + #{amount} >= 0]]>
+	</update>
      
      <select id="getPlaceInfoByPlaceId" parameterType="integer" resultType="PlaceInfo">
 		SELECT 

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/agentInfoMapper.xml

@@ -263,10 +263,10 @@
         tb_iamberry_agent_agentinfo
         <where>
             <if test="agentName != null">
-                and agent_name = #{agentName}
+                and agent_name LIKE CONCAT('%',#{agentName},'%')
             </if>
             <if test="agentTel!=null and agentTel!=''">
-                and agent_tel = #{agentTel}
+                and agent_tel LIKE CONCAT('%',#{agentTel},'%')
             </if>
             <if test="agentRoleId!=null and agentRoleId!=''">
                 and agent_role_id = #{agentRoleId}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/agentPurchaseOrderMapper.xml

@@ -163,6 +163,9 @@
           <if test="agentOrderid != null and agentOrderid != ''">
               o.agent_orderid = #{agentOrderid}
           </if>
+          <if test="agentId != null and agentId != ''">
+              and a.agent_id = #{agentId}
+          </if>
           <if test="agentName != null and agentName != ''">
               and a.agent_name like CONCAT('%',#{agentName},'%')
           </if>
@@ -246,6 +249,9 @@
             <if test="agentOrderid != null and agentOrderid != ''">
                 o.agent_orderid = #{agentOrderid}
             </if>
+            <if test="agentId != null and agentId != ''">
+                and a.agent_id = #{agentId}
+            </if>
             <if test="agentName != null and agentName != ''">
                 and a.agent_name like CONCAT('%',#{agentName},'%')
             </if>
@@ -278,7 +284,7 @@
         tb_iamberry_order_hint
       <where>
           <if test="hintTime != null and hintTime != ''">
-              date_format(hint_time, '%Y-%m-%d') = date_format(#{hintTime}, '%Y-%m-%d')
+              date_format(hint_time, '%Y-%m-%d') <![CDATA[ <= ]]> date_format(#{hintTime}, '%Y-%m-%d')
           </if>
           <if test="hintStatus != null and hintStatus != ''">
               and hint_status = #{hintStatus}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/apparatusMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.wechat.service.mapper.ApparatusMapper">
+
+    <!-- 分页查询机器列表 -->
+    <select id="listApparatusPage" parameterType="Apparatus" resultType="Apparatus">
+      SELECT
+       *
+      FROM
+       tb_iamberry_member_apparatus
+      <where>
+        <if test="userOpenid != null and userOpenid != ''">
+            user_openid = #{userOpenid}
+        </if>
+        <if test="apparatusStatus != null and apparatusStatus != ''">
+            AND apparatus_status = #{apparatusStatus}
+        </if>
+      </where>
+        ORDER BY apparatus_id DESC
+      <if test="page!=null and page.pageSize>0 ">
+          LIMIT ${page.recordBegin},${page.pageSize}
+      </if>
+    </select>
+</mapper>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAgentToothHandler.java

@@ -545,7 +545,7 @@ public class AdminAgentToothHandler {
                     .replaceFirst("orderIdValueOrder", orderId)
                     .replaceFirst("orderValuePackageId", SendMessageUtil.hashmap.get(map.get("postFirm")) + ":" + map.get("postNum"))
                     .replaceFirst("orderRemarkValue", ResultInfo.INTOSHOP);
-            sendMessageUtil.sendTemplateMessageToOpenid(data, agentOrder.getAgentOpenId(), ResultInfo.PAGE_SHIPMENT + orderId, 2);
+            sendMessageUtil.sendTemplateMessageToOpenid(data, agentOrder.getAgentOpenId(), "", 2);
         }
 
         msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agentInfo/AgentOrderHandler.java

@@ -76,6 +76,7 @@ public class AgentOrderHandler {
             AgentConfig agentConfig = new AgentConfig();
             agentConfig.setColorId(pd.getColorId());
             agentConfig.setAgentId(agentTooth.getAgentId());
+            agentConfig.setConfigStatus(1);
             agentConfig = agentInfoService.getAgentConfig(agentConfig);
             if (agentConfig != null && agentConfig.getConfigAmount() != null && agentConfig.getConfigAmount() != 0) {
                 pd.setConfigAmount(agentConfig.getConfigAmount());

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agentInfo/AgentToothHandler.java

@@ -177,9 +177,11 @@ public class AgentToothHandler {
         //查询代理商信息
         List<AgentTooth> toothList = agentInfoService.selectAllAgentinfo(tooth);
         if (toothList == null || toothList.size() == 0) {
-            req.getRequestDispatcher(NameUtils.getConfig("WECHAT_AGENT_TOOT_ACTIVATE")).forward(req, res);
+            res.sendRedirect(NameUtils.getConfig("WECHAT_AGENT_TOOT_ACTIVATE"));
+            //req.getRequestDispatcher(NameUtils.getConfig("WECHAT_AGENT_TOOT_ACTIVATE")).forward(req, res);
         } else {
-            req.getRequestDispatcher(NameUtils.getConfig("WECHAT_AGENT_TOOT_CENTER")).forward(req, res);
+            res.sendRedirect(NameUtils.getConfig("WECHAT_AGENT_TOOT_CENTER"));
+            //req.getRequestDispatcher(NameUtils.getConfig("WECHAT_AGENT_TOOT_CENTER")).forward(req, res);
         }
     }
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -0,0 +1,56 @@
+package com.iamberry.wechat.handles.apparatus;
+
+import com.iamberry.wechat.core.entity.PageBean;
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.apparatus.Apparatus;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.apparatus.ApparatusService;
+import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/12/28.
+ */
+@Controller
+@RequestMapping("/wechat/apparatus")
+public class ApparatusHandler {
+
+    @Autowired
+    private ApparatusService apparatusService;
+
+    /**
+     * 分页查询用户机器信息
+     * @param request
+     * @param pageNO
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/select_apparatus_page")
+    public ResultMsg selectApparatusPage(HttpServletRequest request,
+                                         @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
+                                         @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        Member member = WechatUtils.getUserBySession(request);
+        Apparatus apparatus = new Apparatus();
+        apparatus.setUserOpenid(member.getUserOpenid());
+        apparatus.setApparatusStatus(1);
+        PageBean page = new PageBean();
+        page.setPageNumber(pageNO);
+        page.setPageSize(pageSize);
+        apparatus.setPage(page);
+        //分页查询用户绑定机器信息
+        List<Apparatus> apparatusList = apparatusService.listApparatusPage(apparatus);
+        msg.setData(apparatusList);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        return msg;
+    }
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -211,7 +211,10 @@ public class ProductInfoHandler {
 		}
 
 		if (StaticInfo.pattern.matcher(productId).find()) {
+			//获取产品详情
 			Product product = this.productInfoService.getProductByProductId(Integer.parseInt(productId),colorId);
+			//获取该产品所有颜色信息
+			List<ProductColor> colorList = productInfoService.selectColorList(Integer.parseInt(productId));
 
 			String[] machineIds = {};
 			boolean codeFlag = false;
@@ -228,23 +231,6 @@ public class ProductInfoHandler {
 					}
 				}
 			}
-			Map<String,Object> qrCodeMap = createQrCode(productId,colorId,member,codeFlag);
-
-            /*//如果是有二维码的商户，进入后显示优惠价
-            int num = productInfoService.getQrCodeByPlaceOpenId(member.getUserOpenid());
-            if (num > 0) {
-                QrcodeGift gift = new QrcodeGift();
-                List<QrcodeGift> giftList = productInfoService.listQrcodeGift(gift);
-                if (giftList != null && giftList.size() > 0 && product != null) {
-                    for (QrcodeGift qrcodeGift : giftList) {
-                        if (product.getColorId().intValue() == qrcodeGift.getQrcodeColorId()
-                            && qrcodeGift.getQrcodePreDiscount() != null
-                            && qrcodeGift.getQrcodePreDiscount() > 0) {
-                            product.setProductDiscount(qrcodeGift.getQrcodePreDiscount());
-                        }
-                    }
-                }
-            }*/
 
 			//如果用户是扫描二维码进入，则显示优惠价
 			String userQrcodeType = request.getParameter("userQrcodeType");
@@ -326,15 +312,16 @@ public class ProductInfoHandler {
 			 */
 			map = new HashMap<String, Object>();
 
-			if ((boolean)qrCodeMap.get("flag")) {
+			/*if ((boolean)qrCodeMap.get("flag")) {
 				map.put("qrCode", qrCodeMap.get("qrCode"));
 				map.put("shopQrCode", qrCodeMap.get("shopQrCode"));
-			}
-			map.put("flag", (boolean)qrCodeMap.get("flag"));	//判断是否有商户个人二维码
+			}*/
+			map.put("flag", false);	//判断是否有商户个人二维码
 			map.put("isShow", ResultInfo.ISSHOW);
 			map.put("cartDesc", ResultInfo.CARTDESC);
 			map.put("cart_url", ResultInfo.CART_URL);
 			map.put("product", product);
+			map.put("colorList",colorList);
 			map.put("shareOpenid", member.getUserOpenid());
 			remsg.setData(map);
 			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -128,6 +128,17 @@ public class CouponTypeHandler {
 				it.remove();
 				continue;
 			}
+			//如果有来源限制，则不在该来源范围内的不能领取优惠券
+			if (cType.getCouponIsSource() == 1 && StringUtils.isNotEmpty(cType.getCouponSourceName())) {
+				// 当前路径，相对于应用路径，不包括参数
+				String referer = req.getHeader("referer");
+				if (referer.indexOf(cType.getCouponSourceName()) < 0) {
+					it.remove();
+					continue;
+				}
+			}
+
+
 			// 当前用户已领取且时间为一个月以内
 			for (CouponItemDto cItem : itemList) {
 				if (cType.getCouponId() != null

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/DrpWeChatHandler.java

@@ -7,12 +7,14 @@ import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
+import com.iamberry.wechat.core.entity.drp.PlaceWithDrawalsLogs;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.reback.RebackInfo;
 import com.iamberry.wechat.core.entity.statictics.MarketInfo;
 import com.iamberry.wechat.core.entity.statictics.SalesmanInfo;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.drp.PlaceInfoService;
+import com.iamberry.wechat.face.drp.PlaceWithDrawalsLogsService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.reback.RebackServices;
@@ -60,6 +62,8 @@ public class DrpWeChatHandler {
 	private SystemService systemService;
 	@Autowired
 	private RebackServices rebackServices;
+	@Autowired
+	private PlaceWithDrawalsLogsService placeWithDrawalsLogsService;
 
 
 	/**
@@ -468,6 +472,15 @@ public class DrpWeChatHandler {
 		//根据placeinfoID查询是否存在二维码
 		Integer isqrcode = placeInfoService.getIsQrCode(String.valueOf(placeInfo.getId()));
 
+		//查询代理商提现记录
+		Map<String,Object> logMap = placeWithDrawalsLogsService.HistoryRecords(member.getUserOpenid());
+		List<PlaceWithDrawalsLogs> logList = (List<PlaceWithDrawalsLogs>)logMap.get("list");
+		if (logList == null || logList.size() == 0) {
+			map.put("isFlag",false);
+		} else {
+			map.put("isFlag",true);
+		}
+
 		map.put("money",placeInfo.getAmount());					//可用金额
 		map.put("activateNum",placeMap.get("activateNum"));		//商户：激活数量，用户：未购买数量
 		map.put("rebackMoney",placeMap.get("rebackMoney"));		//待返金额

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -359,6 +359,9 @@ public class MQTask implements InitializingBean {
 		}
 	}
 
+	/**
+	 * 保持百胜系统cookie的活性（每分钟执行一次）
+	 */
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
 	@Scheduled(cron = "0 0/1 * * * ?")
 	public void selectEfastOrder() {
@@ -377,8 +380,11 @@ public class MQTask implements InitializingBean {
 
 	}
 
+	/**
+	 * 电动牙刷商城更换刷头提示（每小时执行一次）
+	 */
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
-	@Scheduled(cron = "0 0/1 * * * ?")
+	@Scheduled(cron = "0 0 0/1 * * ?")
 	public void updateToothHint() {
 		//获取更换刷头时间间隔
 		ShopSystemRule rule =  systemService.selectOneShopRuleById(245);

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -231,6 +231,10 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder" alias="StatisticsSalesOrder"/>
 		<!-- 水机租赁 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.rent.RentTypeInfo" alias="RentTypeInfo"/>
+
+		<!-- 机器 -->
+		<typeAlias type="com.iamberry.wechat.core.entity.apparatus.Apparatus" alias="Apparatus"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
 	<mappers>
@@ -315,5 +319,7 @@
 		<mapper resource="com/iamberry/rent/service/order/mapper/rentExchangeMapper.xml"/>-->
 		<!-- 机器编号，获取二维码-->
 		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
+		<!-- 机器 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
 	</mappers>
 </configuration>

tooth-wechat-web/src/main/resources/platform.properties

@@ -90,9 +90,9 @@ WECHAT_SHOP_PRODUCT_LIST=/WEB-INF/views/wechat/chanpin_list.html
 # wechat_cash_log_list
 WECHAT_CASH_LOG_LIST=/WEB-INF/views/wechat/cash_log.html
 
-WECHAT_AGENT_TOOT_ACTIVATE=/view/agent_tooth/activate_agent_id.html
+WECHAT_AGENT_TOOT_ACTIVATE=/tooth/view/agent_tooth/activate_agent_id.html
 
-WECHAT_AGENT_TOOT_CENTER=/view/agent_tooth/agent_center.html
+WECHAT_AGENT_TOOT_CENTER=/tooth/view/agent_tooth/agent_center.html
 
 WECHAT_UPDATE_TOOTH_HINT=http://test.iamberry.com/tooth/view/agent_tooth/replace_point.html?hintId=
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/agentInfo/addAgentConfig.jsp

@@ -105,7 +105,7 @@
                     $.each(color_list, function(i,item){
                         var li = document.createElement('li');
                         li.innerHTML = '<input disabled="disabled" class="input-text" placeholder="请输入产品优惠价" style="width: 150px;" type="text" id="price' + i + '" index="' + i + '" />&nbsp;&nbsp;&nbsp;&nbsp;'
-                            + '<input id="che_product'+ i +'" type="checkbox" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')"/>' + item.colorProductName;
+                            + '<input id="che_product'+ i +'" type="checkbox" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')"/>' + item.colorProductName + "(" + item.colorName + ")";
                         table.appendChild(li);
                     });
                 }else{
@@ -127,6 +127,7 @@
 
     function checkValue () {
         var flag = true;
+        product_color = '';
         var che_product = document.getElementsByName('che_product');
         for(var i=0; i<che_product.length; i++){
             if(che_product[i].checked){
@@ -149,7 +150,6 @@
                 product_color+=che_product[i].value+':'+price+',';
             }
         }
-        console.log(product_color);
         return flag;
     }
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/agentInfo/agentInfoList.jsp

@@ -93,8 +93,10 @@
                         <option value="1" ${list.agentStatus==1?'selected':''}>启用</option>
                         <option value="2" ${list.agentStatus==2?'selected':''}>停用</option>
                     </select>
+                    <c:if test="${list.agentStatus == 1}">
                     <a onclick="updateAgent('${list.agentId}')"
                        title="编辑" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6df;</i></a>
+                    </c:if>
                 </td>
         </c:forEach>
         </c:if>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/agentInfo/agentOrderList.jsp

@@ -243,6 +243,7 @@
 
     //显示物流信息
     function show_address(addressInfo,postNum,postFirm) {
+        var txtPostFirm = '';
         if (addressInfo == null || addressInfo == '') {
             $('#addressInfo').html('暂无');
         } else {
@@ -253,10 +254,28 @@
         } else {
             $('#postNum').html(postNum);
         }
-        if (postNum == null || postNum == '') {
+        if (postFirm == null || postFirm == '') {
             $('#postFirm').html('暂无');
         } else {
-            $('#postFirm').html(postFirm);
+            switch (postFirm) {
+                case "sto":txtPostFirm = '申通快递';break;
+                case "yto":txtPostFirm = '圆通快递';break;
+                case "sf":txtPostFirm = '顺丰快递';break;
+                case "ems":txtPostFirm = '邮政EMS';break;
+                case "zto":txtPostFirm = '中通快递';break;
+                case "zjs":txtPostFirm = '宅急送';break;
+                case "yunda":txtPostFirm = '韵达快递';break;
+                case "cces":txtPostFirm = 'cces快递';break;
+                case "pick":txtPostFirm = '上门提货';break;
+                case "htky":txtPostFirm = '汇通快递';break;
+                case "ttkdex":txtPostFirm = '天天快递';break;
+                case "stars":txtPostFirm = '星晨急便';break;
+                case "jd":txtPostFirm = '京东快递';break;
+                case "01":txtPostFirm = '其他';break;
+                case "02":txtPostFirm = '上门送货';break;
+                default:txtPostFirm = '圆通快递';break;
+            }
+            $('#postFirm').html(txtPostFirm);
         }
         $('#layui-address').show();
     }

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/agentInfo/updateAgentConfig.jsp

@@ -120,10 +120,10 @@
                         var li = document.createElement('li');
                         if (config.colorId == item.colorId) {
                             li.innerHTML = '<input class="input-text" style="width: 150px;" placeholder="请输入产品优惠价" type="text" id="price' + i + '" index="' + i + '" value="' + config.configAmount/100 + '" />&nbsp;&nbsp;&nbsp;&nbsp;'
-                                + '<input id="che_product'+ i +'" type="radio" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')" checked="checked"/>' + item.colorProductName;
+                                + '<input id="che_product'+ i +'" type="radio" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')" checked="checked"/>' + item.colorProductName  + "(" + item.colorName + ")";
                         } else {
                             li.innerHTML = '<input disabled="disabled" class="input-text" style="width: 150px;" placeholder="请输入产品优惠价" type="text" id="price' + i + '" index="' + i + '" />&nbsp;&nbsp;&nbsp;&nbsp;'
-                                + '<input id="che_product'+ i +'" type="radio" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')"/>' + item.colorProductName;
+                                + '<input id="che_product'+ i +'" type="radio" index="' + i + '" name="che_product" value="'+item.colorId+'" onclick="write_price('+ i +')"/>' + item.colorProductName  + "(" + item.colorName + ")";
                         }
                         table.appendChild(li);
                     });

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/index.jsp

@@ -36,13 +36,13 @@
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<title>后台登录 - 上海WaterO微商场管理系统</title>
-<meta name="keywords" content="上海WaterO微商场管理系统">
+<title>后台登录 - 上朵微商场管理系统</title>
+<meta name="keywords" content="上朵微商场管理系统">
 </head>
 <body>
 	<header class="Hui-header cl">
-		<a class="Hui-logo l" title="上海WaterO微商场管理系统" href="#">上海WaterO微商场管理系统</a>
-		<a class="Hui-logo-m l" href="#" title="上海WaterO微商场管理系统">上海WaterO微商场管理系统</a>
+		<a class="Hui-logo l" title="上朵微商场管理系统" href="#">上朵微商场管理系统</a>
+		<a class="Hui-logo-m l" href="#" title="上朵微商场管理系统">上朵微商场管理系统</a>
 		<span class="Hui-subtitle l">V1.0</span>
 		<%-- 快捷操作 --%>
 		<nav class="mainnav cl" id="Hui-nav">
@@ -51,7 +51,7 @@
 		</nav>
 		<%-- 管理员个人信息 --%>
 		<ul class="Hui-userbar">
-			<li>上海WaterO管理员</li>
+			<li>上朵管理员</li>
 			<li class="dropDown dropDown_hover"><a href="#"
 				class="dropDown_A">${login_admin_userinfo.adminLoginName } <i class="Hui-iconfont">&#xe6d5;</i></a>
 				<ul class="dropDown-menu radius box-shadow">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/login.jsp

@@ -25,8 +25,8 @@
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<title>后台登录 - 上海WaterO微商场管理系统</title>
-<meta name="keywords" content="上海WaterO微商场管理系统">
+<title>后台登录 - 上朵微商场管理系统</title>
+<meta name="keywords" content="上朵微商场管理系统">
 </head>
 <body onkeydown="keyLogin(event);">
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_details.html

@@ -118,7 +118,7 @@
 
 
 </div>
-<div id="dalog_guanzhu" style="background-color: rgba(0,0,0,.5);position: fixed;width: 100%;height: 100%;left: 0;top: 0;bottom: 0;right: 0;z-index: 99;display: none;">
+<!--<div id="dalog_guanzhu" style="background-color: rgba(0,0,0,.5);position: fixed;width: 100%;height: 100%;left: 0;top: 0;bottom: 0;right: 0;z-index: 99;display: none;">
 	<div style="position: absolute;width: 300px;left: 50%;top: 45%;-webkit-transform: translateX(-50%) translateY(-50%);">
 		<div style="position: relative">
 			<img width="100%" src="//s.iamberry.com/tooth/new/images/dalog_guanzhu.png"/>
@@ -131,7 +131,7 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>-->
 <script src="//s.iamberry.com/tooth/js/mui.min.js?v=2016111701"></script>
 <script src="//s.iamberry.com/tooth/js/shop/main.js?v=2016111701"></script>
 <script src="//s.iamberry.com/tooth/js/jquery-2.1.1.min.js"></script>
@@ -147,10 +147,10 @@
         $("#shopp-div").hide();
         $("#add_cart_logo_div").css("width", "30%");
     }
-    mui('body').on('tap', '#close_dalog', function() {
+    /*mui('body').on('tap', '#close_dalog', function() {
         $("#dalog_guanzhu").hide();
         window.close();
-    });
+    });*/
     $(document).on('tap', '.color-list>button', function() {
         $(this).addClass("active").siblings().removeClass("active");
     });

tooth-wechat-web/src/main/webapp/common/other/kingedit/jsp/upload_json.jsp

@@ -12,9 +12,9 @@ String saveServerPath = "/common/images/uploadimages/";
 // hostname
 String hostName = "";
 if (request.getRequestURL().indexOf("localhost") == -1) {
-	hostName = "http://test.iamberry.com";
+	hostName = "https://w.iamberry.com";
 } else {
-	hostName = "http://localhost:" + request.getLocalPort();
+	hostName = "https://localhost:" + request.getLocalPort();
 }
 //文件保存目录路径
 String savePath = pageContext.getServletContext().getRealPath(saveServerPath);

tooth-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -44,7 +44,7 @@ mui.ready(function() {
             if(res.resultCode != 200){   //未关注
                 pushHistory();
                 window.addEventListener("popstate", function(e) {  //回调函数中实现需要的功能
-                    $("#dalog_guanzhu").show();
+                    //$("#dalog_guanzhu").show();
                 }, false);
             }
         }

tooth-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center3.js

@@ -1,4 +1,4 @@
-var pageNumber = 0,pageSize=10;
+var pageNumber = 0,pageSize=10,isFlag=false;
 
 //初始化mui
 mui.init({
@@ -17,7 +17,7 @@ mui.init({
 $(function(){
     //添加鼠标点击事件
     $(document).on('tap', '#tixian', function() {
-        if($("#money").html() == 0){
+        if($("#money").html() == 0 && !isFlag){
             mui.alert("您的余额不能提现哦！");
         }else{
             tixian();
@@ -64,6 +64,7 @@ mui.ready(function() {
                             $("#userType").val(2);  //用于判断 - 查询用户页面
                             break;
                     }
+                    isFlag = data.isFlag;
                     $('#money').html(accDiv(data.money, 100));
                     $('#rebackMoney').html(accDiv(data.rebackMoney, 100));
                     $('#userNum').html(data.userNum);

tooth-wechat-web/src/main/webapp/view/agent_tooth/agent_center.html

@@ -261,7 +261,7 @@ mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), funct
 		mui('#pullrefresh').scroll().scrollTo(0,0,10);//10毫秒滚动到顶
 	}, false);
 });
-    mui('body').on('tap','.go-purchasing,btn-odt',function() {
+    mui('body').on('tap','.go-purchasing,.btn-odt',function() {
        location.href='/tooth/view/agent_tooth/purchasing_products.html';
     });
     var isPay=true;
@@ -324,11 +324,9 @@ mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), funct
                                                     .alert("对不起，支付失败!请稍后重试!"
                                                         + dt.data.orderId
                                                         + "支付失败!");
-                                                window.location.href = "/tooth/pay/goOrderInfo?orderId="
-                                                    + dt.data.orderId
-                                                    + "&dates="
-                                                    + new Date()
-                                                        .getTime();
+                                                mui.openWindow({
+                                                    url: '/tooth/view/agent_tooth/agent_center.html'
+                                                })
                                                 ;
                                             }
                                         })