master
luoyang 6 years ago
parent 72c7ae90f6
commit f222cc265d

@ -339,7 +339,7 @@ public class ManageAppServiceImp implements ManageAppService {
if (total == null) {
total = new JSONObject();
total.put("total_amount", BigDecimal.ZERO);
total.put("org_prize", BigDecimal.ZERO);
total.put("total_prize", BigDecimal.ZERO);
}
total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM"));
return total;

@ -180,12 +180,12 @@ public class ManageAppController {
}
@RequestMapping(value = "/product/save", method = RequestMethod.POST)
public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@RequestBody ProductBean productBean) {
manageAppService.saveProduct(device, productBean);
}
@RequestMapping(value = "/product/update", method = RequestMethod.PUT)
public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@RequestBody ProductBean productBean) {
manageAppService.updateProduct(device, productBean);
}

@ -100,7 +100,7 @@
<select id="findTotalByOrg" resultType="com.alibaba.fastjson.JSONObject">
SELECT
SUM(gross_amount) total_amount,
SUM(org_charge) org_prize
SUM(org_charge) total_prize
FROM financial_partner_commission
WHERE org_id=#{org_id} AND year=#{year} AND month=#{month}
</select>

Loading…
Cancel
Save