fix

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

@@ -776,8 +776,22 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
         wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness());
         wxCouponChannel.setTitle(wxCoupon.getTitle());
         wxCouponChannel.setTtSpuId(wxCoupon.getGoodsId());
-    	wxCouponChannel.setChannelPrice(channelPrice);
-    	wxCouponChannel.setChannelStock(channelStock);
+        //如果是直播渠道，未设置库存和价格，则用优惠券的
+        if (null != channelId && channelId.intValue() == EnumCouponChannelType.COUPON_CHANNEL_ID_WXLIVE_LIST.getCode().intValue()) {
+        	if (null != channelPrice) {
+            	wxCouponChannel.setChannelPrice(channelPrice);
+            }else {
+            	wxCouponChannel.setChannelPrice(wxCoupon.getSalePrice());
+            }
+            if (null != channelStock) {
+            	wxCouponChannel.setChannelStock(channelStock);
+            }else {
+            	wxCouponChannel.setChannelStock(wxCoupon.getRemainInventory());
+            }
+        }else {
+	    	wxCouponChannel.setChannelPrice(channelPrice);
+	    	wxCouponChannel.setChannelStock(channelStock);
+        }
         
         ResultData resultData = saveOrUpdate(wxCouponChannel);
         WxCouponChannel channel = (WxCouponChannel)resultData.data;