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

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

@@ -9,7 +9,7 @@ public class StayIntegral implements Serializable{
     private Integer stayId;             //记录ID
     private String userOpenId;          //用户openid
     private Integer configId;           //来源
-    private String orderId;//订单id
+    private String orderId;             //订单id
     private Integer stayNumber;         //积分数量
     private Date stayRecordedTime;      //积分入账时间
     private Integer stayStatus;         //状态

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -6,6 +6,7 @@ import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 import com.iamberry.wechat.core.entity.integral.RankRule;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.List;
 
@@ -57,4 +58,12 @@ public interface UseIntegralService {
      * @return
      */
     List<RankRule> getRankRule();
+
+    /**
+     * 定时任务
+     * 待入账积分更改到已入账操作
+     * @return
+     */
+    boolean updateIntegralStayToAlready();
+
 }

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

@@ -2,10 +2,7 @@ package com.iamberry.wechat.service.integral;
 
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.integral.IntegralConfig;
-import com.iamberry.wechat.core.entity.integral.MemberIntegral;
-import com.iamberry.wechat.core.entity.integral.RankRule;
-import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.integral.*;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.service.mapper.UseIntegralMapper;
 import com.iamberry.wechat.tools.NameUtils;
@@ -82,4 +79,17 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     public List<RankRule> getRankRule() {
         return useIntegralMapper.getRankRule();
     }
+
+    @Override
+    public boolean updateIntegralStayToAlready() {
+        StayIntegral stayIntegral = new StayIntegral();
+        /*获取所有的待入账积分*/
+        List<StayIntegral>  stayIntegralList = useIntegralMapper.listStayIntegral(stayIntegral);
+		/*判断时间是否大于的那个时间*/
+		/*增加入账积分，累计积分*/
+		/*大于将删除日志表的待入账，并增加入账记录*/
+        return false;
+    }
+
+
 }

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

@@ -1,10 +1,7 @@
 package com.iamberry.wechat.service.mapper;
 
 import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.integral.IntegralConfig;
-import com.iamberry.wechat.core.entity.integral.MemberIntegral;
-import com.iamberry.wechat.core.entity.integral.RankRule;
-import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.integral.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -79,4 +76,10 @@ public interface UseIntegralMapper {
      */
     List<RankRule> getRankRule();
 
+    /**
+     * 查询待入账积分的集合
+     * @return
+     */
+    List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
+
 }

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

@@ -115,4 +115,35 @@
         )
     </insert>
 
+    <!-- 查询积分来源信息 -->
+    <select id="listIntegralConfig" parameterType="StayIntegral" resultType="StayIntegral">
+        SELECT
+            t.stay_id AS  stayId,
+            t.user_openid AS  userOpenId,
+            t.config_id AS  configId,
+            t.sales_orderid AS  orderId,
+            t.stay_number AS  stayNumber,
+            t.stay_recorded_time AS stayRecordedTime,
+            t.stay_status AS  stayStatus,
+            t.stay_remark AS stayRemark,
+            t.stay_create_time AS stayCreateTime,
+            t.stay_update_time AS stayUpdateTime
+        FROM
+            tb_iamberry_stay_integral t
+        <where>
+            <if test="stayId != null">
+                AND stay_id = #{stayId}
+            </if>
+            <if test="userOpenId != null">
+                AND user_openid = #{userOpenId}
+            </if>
+            <if test="configId != null">
+                AND config_id = #{configId}
+            </if>
+            <if test="stayRecordedTime != null and stayRecordedTime != ''">
+                AND stay_recorded_time &gt;= #{stayRecordedTime}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -10,6 +10,7 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
+import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import org.apache.commons.lang.StringUtils;
@@ -69,6 +70,8 @@ public class MQTask implements InitializingBean {
 	private SystemService systemService;
 	@Autowired
 	private AgentPurchaseOrderService agentPurchaseOrderService;
+	@Autowired
+	private UseIntegralService useIntegralService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -420,9 +423,8 @@ public class MQTask implements InitializingBean {
 	 */
 	@SuppressWarnings(value = {"unchecked", "rawtypes"})
 	@Scheduled(cron = "0 0 0/1 * * ?")
-	public void updateIntegralStayTo() {
-
-
+	public void updateIntegralStayToAlready() {
+		useIntegralService.updateIntegralStayToAlready();
 	}
 
 }