提交代码

dev
胡锐 2 months ago
parent 2e24609291
commit 4fef1d526c
  1. 13
      service/src/main/java/com/hfkj/common/pay/util/SignatureUtil.java
  2. 5
      service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java
  3. 7
      service/src/main/java/com/hfkj/service/gas/BsGasOrderService.java
  4. 5
      service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java
  5. 7
      service/src/main/java/com/hfkj/service/order/OrderCreateService.java

@ -85,14 +85,11 @@ public class SignatureUtil {
}
public static void main(String[] args) throws Exception {
String paramStr = "{ \n" +
" \"reqId\": \"cs0008\",\n" +
" \"appId\": \"hf7356c71fb97ab0\",\n" +
" \"discountPkNo\": \"DPK10018\",\n" +
" \"number\": \"1\",\n" +
" \"phone\": \"17726395120\"\n" +
"}";
String sign = createSign(JSONObject.parseObject(paramStr), "8aef995ff71485dc19b36e35f04c4016");
JSONObject obj = new JSONObject();
obj.put("appid", "hfc030e3c3217dfc");
obj.put("phone", "18328378446");
String sign = createSign(JSONObject.parseObject(obj.toJSONString()), "8518b90a06b4ac67fd2ff8d8ae4c2d62");
System.out.println(sign);
}

@ -48,4 +48,9 @@ public interface BsGasOrderMapperExt {
" <if test='param.refundTimeE != null'><![CDATA[ and refund_time <= #{param.refundTimeE} ]]></if>" +
"</script>")
Map<String,Object> selectGasOrderCount(@Param("param") Map<String,Object> param);
@Select("<script>" +
" select count(1) from bs_gas_order where user_phone = #{userPhone} and `status` in (2,5,6) and create_type = 1 and to_days(pay_time) = to_days(NOW())" +
"</script>")
int countTodayOrder(@Param("userPhone") String userPhone);
}

@ -73,5 +73,10 @@ public interface BsGasOrderService {
*/
List<BsGasOrder> getGasOrderList(Map<String, Object> param);
/**
* 统计今日订单数量
* @param userPhone
* @return
*/
int countTodayOrder(String userPhone);
}

@ -272,4 +272,9 @@ public class BsGasOrderServiceImpl implements BsGasOrderService {
example.setOrderByClause("create_time desc");
return gasOrderMapper.selectByExample(example);
}
@Override
public int countTodayOrder(String userPhone) {
return gasOrderMapper.countTodayOrder(userPhone);
}
}

@ -81,11 +81,18 @@ public class OrderCreateService {
}
}
}
// 下单数量限制
int createOrderLimit = Integer.parseInt(secDictionaryService.getDictionary("GAS_ORDER_CREATE_LIMIT").get(0).getCodeValue());
if (gasOrderService.countTodayOrder(order.getUserPhone()) >= createOrderLimit) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "加油订单每日下单限制"+createOrderLimit+"笔");
}
if (orderDeduction != null && orderDeduction.getUserCouponDiscountId() != null) {
if (discountUseMerService.getDetail(orderDeduction.getCouponDiscountNo(), orderChild.getMerNo()) == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "油站不支持该优惠券使用");
}
}
// 查询油站
BsMerchant merchant = merchantService.getMerchant(orderChild.getMerNo());
if (merchant == null) {

Loading…
Cancel
Save