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-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -118,16 +118,27 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             UseIntegral useIntegral = new UseIntegral();
             useIntegral.setUserOpenId(si.getUserOpenId());
             useIntegral.setIntegralNumber(si.getStayNumber());
+            useIntegral.setStayId(si.getStayId());
             useIntegral.setIntegralBeforeNumber(member.getUserSurplusIntegral()); //变动前
             useIntegral.setIntegralEndNumber(mem.getUserSurplusIntegral()); //变动后
             useIntegral.setIntegralType(1); //入账
             useIntegral.setConfigId(si.getConfigId());
-            useIntegral.setIntegralRemark("");
+            useIntegral.setIntegralRemark("由待入账变更为已入账");
             flag = useIntegralMapper.addUseIntegral(useIntegral);
             if (flag < 1) {
                 throw new RuntimeException("添加入账日志失败");
             }
 
+            /*删除日志*/
+            UseIntegral ui = new UseIntegral();
+            ui.setUserOpenId(si.getUserOpenId());
+            ui.setStayId(si.getStayId());
+            ui.setIntegralType(3);
+            flag = useIntegralMapper.delUseIntegral(ui);
+            if (flag < 1) {
+                throw new RuntimeException("删除待入账日志失败");
+            }
+
             /*再将待入账信息改为已入账状态*/
             StayIntegral stayInte =  new StayIntegral();
             stayInte.setStayId(si.getStayId());

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

@@ -50,6 +50,13 @@ public interface UseIntegralMapper {
     Integer addUseIntegral(UseIntegral useIntegral);
 
     /**
+     * 删除积分日志
+     * @param integralId
+     * @return
+     */
+    Integer delUseIntegral(UseIntegral integralId);
+
+    /**
      * 查询会员积分等级规则信息
      * @param rankRule
      * @return
@@ -89,4 +96,6 @@ public interface UseIntegralMapper {
      */
     List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
 
+
+
 }

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

@@ -187,4 +187,23 @@
         </where>
     </update>
 
+    <!-- 根据banner图片ID，删除图片 -->
+    <delete id="delUseIntegral" parameterType="UseIntegral">
+        DELETE FROM
+          tb_iamberry_use_integral
+        <where>
+            <if test="integralType != null">
+                AND integral_type = #{integralType}
+            </if>
+            <if test="stayId != null">
+                AND stay_id = #{stayId}
+            </if>
+            <if test="userOpenId != null">
+                AND user_openid = #{userOpenId}
+            </if>
+        </where>
+    </delete>
+
+
+
 </mapper>

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

@@ -421,8 +421,8 @@ public class MQTask implements InitializingBean {
 	/**
 	 * 待入账积分更改为已入账积分（每小时执行一次）
 	 */
-//	@SuppressWarnings(value = {"unchecked", "rawtypes"})
-//	@Scheduled(cron = "0 0 0/1 * * ?")
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	@Scheduled(cron = "0 0 0/1 * * ?")
 //	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	public void updateIntegralStayToAlready() {
 		useIntegralService.updateIntegralStayToAlready();