修改了代理商采购订单页面

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-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/cart/ProductInfoHandler.java

@@ -228,7 +228,7 @@ public class ProductInfoHandler {
 					}
 				}
 			}
-			Map<String,Object> qrCodeMap = createQrCode(productId,colorId,member,codeFlag);
+			//Map<String,Object> qrCodeMap = createQrCode(productId,colorId,member,codeFlag);
 
             /*//如果是有二维码的商户，进入后显示优惠价
             int num = productInfoService.getQrCodeByPlaceOpenId(member.getUserOpenid());
@@ -326,11 +326,11 @@ 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);

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

@@ -384,7 +384,7 @@ public class MQTask implements InitializingBean {
 	 * 电动牙刷商城更换刷头提示（每小时执行一次）
 	 */
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
-	@Scheduled(cron = "0 0 0/1 * * ? *")
+	@Scheduled(cron = "0 0 0/1 * * ?")
 	public void updateToothHint() {
 		//获取更换刷头时间间隔
 		ShopSystemRule rule =  systemService.selectOneShopRuleById(245);

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/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/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);
             }
         }