Merge branch 'dev' into test

share-framework/src/main/java/share/framework/aspectj/QPServiceImplAspect.java

@@ -90,7 +90,7 @@ public class QPServiceImplAspect {
             JSONObject jsonObject = JSON.parseObject(params);
             //获得出参
             String outParams = JSON.toJSONString(result);
-            saveLog(couponLog, jsonObject, UserStatusEnum.USED.getCode());
+            saveLog(couponLog, jsonObject, UserStatusEnum.UNUSED.getCode());
             couponLog.setStatus(YesNoEnum.yes.getDisplay_3());
             couponLog.setMessage(outParams);
             couponLog.setCreateTime(new Date());

share-system/src/main/resources/mapper/system/SCouponMapper.xml

@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roomType != null">room_type = #{roomType},</if>
             <if test="couponType != null">coupon_type = #{couponType},</if>
             <if test="orderType != ''">order_type = #{orderType},</if>
-            <if test="packIds != ''">pack_ids = #{packIds},</if>
+            <if test="packIds != null">pack_ids = #{packIds},</if>
             <if test="storeIds != null">store_ids = #{storeIds},</if>
             <if test="dealgroupId != null">dealgroup_id = #{dealgroupId},</if>
             <if test="duration != null and duration != ''">duration = #{duration},</if>