watero母亲节活动

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ImageUtils.java

@@ -79,8 +79,8 @@ public final class ImageUtils {
         String newImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\1.jpg";
         String headImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\ff18fcf3_head.jpg";
         String codeImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\545e3eeb_code.jpg";
-        String text = "小茗同学";
-        String alltext = ",,,,,,,,,,,,,妈妈的三行情书,,,,,,,,,,,,\n 妈妈的三行情书\n 妈妈的三行\n 妈妈的三行";
+        String text = "小茗同学";   //13    26            12
+        String alltext = "，，，，，，，，，，，，，\nhhhhhhhhhhhhhhhhhhhhhhhhhh\n妈妈的三行\n妈妈的三行";
 //        String alltext = "You are the best mom,th,asssx had.\nSometimes it may not seem like it, but";
 
 

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -112,7 +112,7 @@ public class CartHandlers {
 				return remsg;
 			}
 			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-			if (user.getUserDealers() != null && user.getTemplateId() != null 
+			if (user.getUserDealers() != null && user.getTemplateId() != null
 					&& templateId == user.getTemplateId().intValue()  && user.getUserResType().intValue() == 3) {
 				//若果是金牌会员下线，产品的价格就以优惠价显示
 				for (CartDto cartDto : cartList) {
@@ -137,19 +137,19 @@ public class CartHandlers {
 			for (CartDto cartDto : cartList) {
 				
 				//如果购买过订单，则滤芯的价格可按折扣价购买
-				if (orderNum > 0) {
-					if (cartDto.getProductType().intValue() == 2) {
-						UserGiftDto userGiftDto = new UserGiftDto();
-						userGiftDto.setUserLevel(3);
-						userGiftDto.setUserProductId(cartDto.getCartProductId());
-						userGiftDto.setUserColorId(cartDto.getCartColorId());
-						//根据商品id和会员等级查询礼品信息
-						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-						if (userGiftDto != null) {
-							cartDto.setProductDiscount(userGiftDto.getUserDiscount());
-						}
-					}
-				}
+//				if (orderNum > 0) {
+//					if (cartDto.getProductType().intValue() == 2) {
+//						UserGiftDto userGiftDto = new UserGiftDto();
+//						userGiftDto.setUserLevel(3);
+//						userGiftDto.setUserProductId(cartDto.getCartProductId());
+//						userGiftDto.setUserColorId(cartDto.getCartColorId());
+//						//根据商品id和会员等级查询礼品信息
+//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//						if (userGiftDto != null) {
+//							cartDto.setProductDiscount(userGiftDto.getUserDiscount());
+//						}
+//					}
+//				}
 				
 				if (cartDto.getProductStatus() != null && cartDto.getProductStatus() == 1) { 	// 产品状态:在售
 					total += cartDto.getCartNum() * cartDto.getProductDiscount();

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mothMovable/MothMovableHandler.java

@@ -88,7 +88,11 @@ public class MothMovableHandler {
         mothMovable.setMothMovaOpenId(member.getUserOpenid());
         mothMovable.setMothMovaHead(member.getUserHead());
 
-        String name = java.net.URLDecoder.decode( member.getUserNickname(), ENCODE);
+        String name = "";
+        if(member.getUserNickname() != null && !"".equals(member.getUserNickname())){
+            name = java.net.URLDecoder.decode( member.getUserNickname(), ENCODE);
+            name = name.trim();
+        }
         mothMovable.setMothMovaName(name);
         try {
             Integer falg = mothMovableService.save(mothMovable,realPath);

watero-wechat-web/src/main/resources/iamberry-wechat-service-datasource.xml

@@ -38,6 +38,8 @@
         <property name="testWhileIdle" value="true" />
         <property name="testOnBorrow" value="false" />
         <property name="testOnReturn" value="false" />
+		<!-- 物理连接初始化的时候执行的sql ： 设置编码，Mysql服务器需要更高版本 -->
+		<property name="connectionInitSqls" value="set names utf8mb4;"/>
         <property name="filters" value="stat"/>
         <!-- 配置监控统计拦截的filters -->
         <property name="proxyFilters">