xhxu 4 лет назад
Родитель
Сommit
d774be32a9
3 измененных файлов: 24 добавлений и 4 удалений
  1. +22
    -2
      mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 22
- 2
mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java Просмотреть файл

@@ -48,19 +48,39 @@ public class JinMaoController extends BaseController {
/**
* 金茂东风湖运动公园用户数据推送。
* @param response
* @param request
* @throws IOException
* dfh user:{
* phone=17891060680,
* user_name=???,
* sex=1,
* birthday=Jan 27, 2002 12:00:00 AM,
* id_card=142228200201275628,
* height=172,
* weight=68,
* address=??,
* register_time=Jan 21, 2021 5:58:37 PM,
* unionid=oLUeT4poGhpUKR3vPU5huMU3o-no}
*/
@RequestMapping(value = "/dfh/user")
@ResponseBody
public void dfhUser(@RequestBody Map param) throws IOException {
logger.info("dfh user:"+param);

}
/**
* 金茂东风湖运动公园订单数据推送。
* @throws Exception 可能产生的任何异常
* dfh order:{
* price=15,
* num=1,
* userPhone=18798929852,
* gymName=东风湖运动公园篮球馆,
* payWay=微信支付,
* ID=XCX1202101091825052226,
* time=Jan 9, 2021 6:25:16 PM,
* productName=购卡:单次票(六折)
* }
*/
@RequestMapping(value = "/dfh/order")
public void dfhOrder(@RequestBody Map param) throws Exception {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2304,7 +2304,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}else if(EnumRentContractType.RENT_BY_JOINT.getCode().equals(type)){
Double twoPayRatio1 = new BigDecimal(wxRentContract.getPayRatio())
.divide(new BigDecimal(100))
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();;
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("twoPayRatio1",twoPayRatio1);
result.put("twoPayDate",wxRentContract.getPayDate());
if(StringUtils.isNotBlank(incrementStartDate)){


+ 1
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -790,7 +790,7 @@
left join wx_rent_contract rc on rc.merchant_id = m.id and rc.is_del=0
where s.`id` = #{shopId}
and rc.`status` in (2,3)
and rc.`rental_start_date` <= now() and rental_end_date >= now()
and rc.`rental_start_date` <= now() and rc.rental_end_date >= now()
order by rc.`updatetime` desc;
</select>


Загрузка…
Отмена
Сохранить