积分商城

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -106,6 +106,8 @@ public class ResultInfo {
 	 * 订单详情
 	 */
 	public static String ORDER_DETAIL = "https://s.iamberry.com/soodo/wechat/order-details.html?orderId=";
+	/*配置首页*/
+	public static String INDEX_DETAIL = "https://s.iamberry.com/soodo/wechat/index.html";
 	/**
 	 * <礼品卡>推荐人推送消息 跳转页面
 	 */
@@ -273,7 +275,10 @@ public class ResultInfo {
 	public static final String NEXTUSERTUIHUOMESSAGE = "您的下线已退货~";
 	public static final String ORDERGUOQI = "您有订单未支付~";
 	public static final String ADDPROBATIONORDER = "您的下线有试用订单生成~";
-	
+
+	public static final String REGISTERED = "小朵特意为您准备了礼物（线上口腔专家咨询），点击查看详情";
+	public static final String REGISTERED_TITLE = "欢迎您，小朵等您很久了哦";
+
 	public static final String PAYSUCCESS = "尊敬的用户，您好，您已成功支付";
 	public static final String PAYSUCCESSFOOT = "感谢您的支持，祝您使用愉快!";
 	public static final String sendRemark1 = "如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）";

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/payUtil/RandomUtil.java

@@ -88,7 +88,7 @@ public class RandomUtil {
 	 */
 	public static String getRandom(){
 		String randNum = new Random().nextInt(1000000)+"";
-		if(randNum.length()!=6){
+		if(randNum.length()!=4){
 			return getRandom();
 		}
 		return randNum;

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/IntegralOrderServiceImpl.java

@@ -141,7 +141,7 @@ public class IntegralOrderServiceImpl  implements IntegralOrderService {
                 integralItem.setIntegralItemTotal(monTol);
                 monTotal += monTol;
                 isPay = 1;
-                throw new RuntimeException("-");
+                throw new RuntimeException("暂不支持支付");
             }
 
             /*朵粉币*/
@@ -263,6 +263,7 @@ public class IntegralOrderServiceImpl  implements IntegralOrderService {
         UseIntegral useIntegral = new UseIntegral();
         useIntegral.setUserOpenId(member.getUserOpenid());
         useIntegral.setIntegralType(2);
+        useIntegral.setConfigId(17);
         useIntegral.setIntegralNumber(dfbiTotal);
         useIntegral.setIntegralBeforeNumber(integralBeforeNumber);
         useIntegral.setIntegralEndNumber(integralEndNumber);

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

@@ -27,6 +27,7 @@
         t.integral_order_transaction_date,
         t.integral_order_create_date
     </sql>
+
     <select id="getIntegralOrderList" resultMap="BaseResultMap" parameterType="IntegralOrder" >
         select
         <include refid="Base_List" />
@@ -45,7 +46,9 @@
                 AND t.integral_order_admin_remark = #{integralOrderAdminRemark}
             </if >
         </where>
+        ORDER BY t.integral_order_id DESC
     </select>
+
     <select id="getIntegralOrderById" resultMap="BaseResultMap" parameterType="String" >
         select
         <include refid="Base_List" />

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

@@ -389,7 +389,7 @@
 		<include refid="allField"/>
 		from TB_IAMBERRY_USER_USERINFO
 		where
-			date_format(user_birth_date,'%Y-%m-%d') = date_format(#{userBirthDate},'%Y-%m-%d')
+			date_format(user_birth_date,'%m-%d') = date_format(#{userBirthDate},'%m-%d')
 		AND
 			user_identity = 1
 	</select>

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

@@ -238,6 +238,7 @@
         <if test="userNickName!=null and userNickName != ''">
             AND  u.user_nickname like CONCAT('%',#{userNickName},'%')
         </if>
+        ORDER  BY i.integral_id DESC
     </select>
     <!--待入账积分列表查询-->
     <select id="listAdminStayIntegral" parameterType="StayIntegral" resultType="StayIntegral">

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

@@ -15,6 +15,7 @@ import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import com.iamberry.wechat.tools.payUtil.RandomUtil;
 import com.iamberry.wechat.tools.payUtil.StringUtil;
 import net.sf.json.JSONObject;
@@ -45,6 +46,8 @@ public class ApparatusHandler {
     private Logger logger = LoggerFactory.getLogger(ApparatusHandler.class);
 
     @Autowired
+    private SendMessageUtil sendMessageUtil;
+    @Autowired
     private ApparatusService apparatusService;
     @Autowired
     private SystemService systemService;
@@ -144,6 +147,10 @@ public class ApparatusHandler {
         ResultMsg msg = new ResultMsg();
         Member memberInfo = WechatUtils.getUserBySession(request);
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+        boolean isRegistered = false;
+        if(memberInfo.getUserIdentity() == 1){
+            isRegistered = true;
+        }
         if(memberInfo.getUserTel() == null || !memberInfo.getUserTel().equals(member.getUserTel())){
             //判断验证码
             //使用request对象的getSession()获取session，如果session不存在则创建一个
@@ -164,7 +171,7 @@ public class ApparatusHandler {
             nowTime.add(Calendar.MINUTE, 5);
             Date verData = nowTime.getTime();
             if(!verificationCode.equals(code) || (verData.getTime() < new Date().getTime())  ){
-                //return new ResultMsg(false, ResultInfo.ERRORCODE, "验证码不正确或已失效，请重新获取!",null);
+                return new ResultMsg(false, ResultInfo.ERRORCODE, "验证码不正确或已失效，请重新获取!",null);
             }
         }
 
@@ -214,6 +221,25 @@ public class ApparatusHandler {
         //注册会员
         boolean flag = apparatusService.registerMember(apparatus,member);
         if (flag) {
+
+            if(!isRegistered){
+                logger.info("新用户注册推送信息，用户openid为"+memberInfo.getUserOpenid());
+                Date date = new Date();
+                String dataText = format.format(date);
+                try {
+                    sendMessageUtil.registeredTemplate(
+                            ResultInfo.REGISTERED_TITLE,
+                            memberInfo.getUserNickname(),
+                            "100",
+                            dataText,
+                            ResultInfo.REGISTERED,
+                            memberInfo.getUserOpenid(),
+                            ResultInfo.INDEX_DETAIL);
+                } catch (Exception e) {
+                    logger.info("注册推送信息失败，用户openid为"+memberInfo.getUserOpenid());
+                }
+            }
+
             msg.setResultCode(ResultInfo.SUCCESSCODE);
             msg.setStatus(true);
         } else {

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/IntegralOrderHandler.java

@@ -108,8 +108,11 @@ public class IntegralOrderHandler {
         // 查询订单列表
         PagedResult<IntegralOrder> result = integralOrderService.listIntegralProductPage(pageRequest);
 
+        Member member = memberService.getMemberByUserOpenId(m.getUserOpenid());
+
         Map<String,Object> map=new HashMap<String, Object>();
         map.put("integralOrder",result.getDataList());
+        map.put("integral",member.getUserSurplusIntegral());
 
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -329,6 +329,9 @@ public class UseIntegralHandler {
                 lists.add(r);
             }
         }
+        if(lists == null || lists.size() == 0){
+            lists.add(list.get(list.size()-1));
+        }
         /**************未发货数量*****************/
         Integer notSendCount=adminOrderService.getNotSendCount(openid);
 

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

@@ -503,7 +503,7 @@ public class MQTask implements InitializingBean {
 	 * 每天0点为当天生日的人送积分
 	 */
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
-	//	@Scheduled(cron = "0 0/2 * * * ?")	//每三分钟执行一次
+//	@Scheduled(cron = "0 0/2 * * * ?")	//每三分钟执行一次
 	@Scheduled(cron = "0 0 9 * * ?")	//每天9点触发
 	public void birthday() {
 		logger.info("生日福利定时任务");

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -413,7 +413,6 @@ public class OrderHandler {
 				item.setItemColorId(cartDto.getCartColorId());
 				list.add(item);
 
-
 				if(cartDto.getProductType() == 100){		//当订单中有电动牙刷时，isContainProduct为true
 					isContainProduct = true;
 				}