diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index 888f92d26..4a5ae7c7c 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,6 +37,7 @@ public class WxDateAmountRecordController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name="tenantId",value="租户id",dataType="String", paramType = "query",required=true), @ApiImplicitParam(name="merchantId",value="商户id",dataType="long", paramType = "query",required=true)}) + @GetMapping("list") public ResultData getRecord(String tenantId,Long merchantId) { Calendar c =Calendar.getInstance(); int weekOfYear =c.get(Calendar.WEEK_OF_YEAR); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java index 769fb12c1..6b1cb4d4a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java @@ -9,7 +9,7 @@ public interface WxDateAmountRecordMapper extends CommonMapper findList(WxDateAmountRecord wxDateAmountRecord); - + int updateAmount(WxDateAmountRecord wxDateAmountRecord); diff --git a/mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java b/mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java index 4bcaea949..b86b617e7 100644 --- a/mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java +++ b/mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java @@ -38,8 +38,16 @@ public interface WxDateAmountRecordService { */ void deleteById(Long id); - - + /** + * 修改交易核销 + * @param tenantId 租户id + * @param merchantId 商户id + * @param type 类型 0 交易记录 1.核销记录 + * @param payPrice 金额 + * @return + */ + int updateAmount(String tenantId,Long merchantId + ,Integer type,Integer payPrice); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java index e5761b636..b2f2a7fec 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java @@ -43,12 +43,24 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService public void deleteById(Long id) { wxDateAmountRecordMapper.deleteByPrimaryKey(id); } - - - - - - - + + @Override + public int updateAmount(String tenantId, Long merchantId, Integer type, Integer payPrice) { + Date now = new Date(); + Calendar cal1 = Calendar.getInstance(); + cal1.setTime(now); // 将时分秒,毫秒域清零 + cal1.set(Calendar.HOUR_OF_DAY, 0); + cal1.set(Calendar.MINUTE, 0); + cal1.set(Calendar.SECOND, 0); + cal1.set(Calendar.MILLISECOND, 0); + now = cal1.getTime(); + WxDateAmountRecord r = new WxDateAmountRecord(); + r.setDate(now); + r.setTenantId(tenantId); + r.setMerchantId(merchantId); + r.setType(type); + r.setPayPrice(payPrice); + return wxDateAmountRecordMapper.updateAmount(r); + } } diff --git a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml index 201fceed4..b7578ed88 100644 --- a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml @@ -90,7 +90,12 @@ + + update wx_date_amount_record set pay_price=pay_price+#{payPrice} + where tenant_id=#{tenantId} and merchant_id=#{merchantId} + and type=#{type} and date = #{date} +