//update activity

mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

@@ -685,7 +685,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
 	public void setChannelStock(WxCouponChannel record,Integer number) {
 		//设置渠道库存，
         WxCouponChannel couponChannel = wxCouponChannelMapper.selectById(record.getId(), record.getTenantId());
-        if(null != couponChannel.getChannelStock() || couponChannel.getChannelStock().intValue() != 0){
+        if(null != couponChannel.getChannelStock() && couponChannel.getChannelStock().intValue() > 0){
             throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL.getCode(),"请先释放原有库存");
         }
 

mallinkService/src/main/resources/mapper/WxActivityMapper.xml

@@ -150,7 +150,7 @@
     </update>
 
 	<delete id="deleteById" parameterType="Long">
-    	update wx_activity set is_del = 1, update_date=now() where id = #{id}
+    	update wx_activity set is_del = 1, update_time=now() where id = #{id}
     </delete>