|
|
|
@@ -9,24 +9,19 @@ import com.iformall.domain.po.WxMerchantTradeDaily; |
|
|
|
import com.iformall.service.WxMerchantBUserService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxMerchantTradeDailyService; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.collections.map.LinkedMap; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("/api/wxMerchantTradeDaily") |
|
|
|
@@ -109,7 +104,10 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
wxMerchantTradeDaily.setbUserId(getUserId()); |
|
|
|
logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId()); |
|
|
|
wxMerchantTradeDaily.setBUserId(getUserId()); |
|
|
|
logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId()); |
|
|
|
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|