From a217652d33c75df23202828000d82d0ca8555ac2 Mon Sep 17 00:00:00 2001 From: Administrator <1101184511@qq.com> Date: 星期一, 21 四月 2025 02:13:59 +0800 Subject: [PATCH] 初步完成积分后台管理相关页面 --- src/main/java/com/taoke/autopay/controller/client/OrderController.java | 422 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 322 insertions(+), 100 deletions(-) diff --git a/src/main/java/com/taoke/autopay/controller/client/OrderController.java b/src/main/java/com/taoke/autopay/controller/client/OrderController.java index c30d8c8..dc44d01 100644 --- a/src/main/java/com/taoke/autopay/controller/client/OrderController.java +++ b/src/main/java/com/taoke/autopay/controller/client/OrderController.java @@ -8,19 +8,23 @@ import com.google.gson.stream.JsonWriter; import com.taoke.autopay.dao.KeyOrderMapper; import com.taoke.autopay.dto.DYOrderDto; -import com.taoke.autopay.entity.ClientInfo; -import com.taoke.autopay.entity.KeyOrder; +import com.taoke.autopay.entity.*; import com.taoke.autopay.exception.KeyOrderException; +import com.taoke.autopay.exception.KeyVerifyException; +import com.taoke.autopay.exception.WxOrderCountException; import com.taoke.autopay.factory.OrderFactory; -import com.taoke.autopay.service.ClientInfoService; -import com.taoke.autopay.service.KeyOrderService; -import com.taoke.autopay.utils.JsonUtil; -import com.taoke.autopay.utils.StringUtil; -import com.taoke.autopay.utils.TimeUtil; +import com.taoke.autopay.manager.OrderPayFailProcessor; +import com.taoke.autopay.manager.PayCountVerifyManager; +import com.taoke.autopay.service.*; +import com.taoke.autopay.utils.*; +import com.taoke.autopay.utils.order.DYOrderApi; +import com.taoke.autopay.utils.order.OrderChannelApiUtil; +import com.taoke.autopay.utils.order.OrderChannelUtil; import com.taoke.autopay.vo.AcceptData; import com.taoke.autopay.vo.KeyOrderVO; import com.taoke.autopay.vo.OrderFilter; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,12 @@ import javax.annotation.Resource; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author hxh @@ -42,18 +51,19 @@ @RequestMapping("api/order") public class OrderController { - private Logger loggerPay= LoggerFactory.getLogger("payLogger"); + private Logger loggerPay = LoggerFactory.getLogger("payLogger"); - private Gson gson=new GsonBuilder().registerTypeAdapter(Date.class, new TypeAdapter<Date>() { + private Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new TypeAdapter<Date>() { @Override public void write(JsonWriter out, Date value) throws IOException { String desc = ""; if (value != null) { // 鍒ゆ柇鏄惁鏄悓涓�澶� - desc = TimeUtil.getGernalTime(value.getTime(),"yyyy-MM-dd HH:mm:ss"); + desc = TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss"); out.value(desc); - } else + } else { out.value(""); + } } @Override @@ -68,30 +78,53 @@ @Resource private ClientInfoService clientInfoService; + @Resource + private WxUserOrderCountService wxUserOrderCountService; + + @Resource + private WxUserSettingService wxUserSettingService; + + @Resource + private SystemConfigService systemConfigService; + + @Resource + private OrderPayFailProcessor orderPayFailProcessor; + + @Resource + private PayMoneySettingService payMoneySettingService; + + @Resource + private UserSettingService userSettingService; + + @Resource + private PayCountVerifyManager payCountVerifyManager; + + @ResponseBody @RequestMapping("listOrder") - public String listOrder(AcceptData acceptData, OrderFilter filter){ - KeyOrderMapper.DaoQuery query=new KeyOrderMapper.DaoQuery(); + public String listOrder(AcceptData acceptData, OrderFilter filter) { + KeyOrderMapper.DaoQuery query = new KeyOrderMapper.DaoQuery(); Long uid = filter.getUid(); ClientInfo info = clientInfoService.selectByPrimaryKey(uid); query.distributeClientUid = filter.getUid(); - if(info==null){ + if (info == null) { return JsonUtil.loadFalseResult("瀹㈡埛绔疘D涓嶅瓨鍦�"); - } - if(info.getRule()==1){ - // 瓒呯骇绠$悊鍛� - query.distributeClientUid = null; - } - clientInfoService.setActiveTime(filter.getUid(),new Date()); - query.start = (filter.getPage()-1)*filter.getPageSize(); + } + if (info.getRule() == 1) { + // 瓒呯骇绠$悊鍛� + query.distributeClientUid = null; + } + clientInfoService.setActiveTime(filter.getUid(), new Date()); + query.start = (filter.getPage() - 1) * filter.getPageSize(); query.count = filter.getPageSize(); - if(filter.getState()!=null) { + query.minCreateTime = new Date(System.currentTimeMillis() - 1000 * 60 * 30L); + if (filter.getState() != null) { switch (filter.getState()) { case OrderFilter.STATE_NOT_PROCESS: query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_NOT_PROCESS}); break; case OrderFilter.STATE_PROCESSED: - query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_PAY}); + query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_PAY, KeyOrder.STATE_REJECT_PAY}); break; case OrderFilter.STATE_PROCESS_ERROR: query.stateList = Arrays.asList(new Integer[]{KeyOrder.STATE_NOT_PAY}); @@ -99,160 +132,349 @@ } } - if(filter.getTimeType()!=null){ + if (filter.getTimeType() != null) { long now = System.currentTimeMillis(); - String nowDay = TimeUtil.getGernalTime(now,"yyyy-MM-dd"); - switch(filter.getTimeType()){ + String nowDay = TimeUtil.getGernalTime(now, "yyyy-MM-dd"); + switch (filter.getTimeType()) { case OrderFilter.TIME_TYPE_TODAY: - query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(nowDay,"yyyy-MM-dd")); + query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(nowDay, "yyyy-MM-dd")); break; case OrderFilter.TIME_TYPE_YESTERDAY: - query.maxCreateTime = new Date(TimeUtil.convertToTimeTemp(nowDay,"yyyy-MM-dd")); - query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24*60*60*1000L,"yyyy-MM-dd"),"yyyy-MM-dd")); + query.maxCreateTime = new Date(TimeUtil.convertToTimeTemp(nowDay, "yyyy-MM-dd")); + query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24 * 60 * 60 * 1000L, "yyyy-MM-dd"), "yyyy-MM-dd")); break; case OrderFilter.TIME_TYPE_WEEK: Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date(now)); int day = calendar.get(Calendar.DAY_OF_WEEK); - day-=1; - if(day==0){ + day -= 1; + if (day == 0) { // 鏄熸湡澶� - day=7; + day = 7; } - query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24*60*60*1000L*(day-1),"yyyy-MM-dd"),"yyyy-MM-dd")); + query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24 * 60 * 60 * 1000L * (day - 1), "yyyy-MM-dd"), "yyyy-MM-dd")); break; case OrderFilter.TIME_TYPE_MONTH: - query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now,"yyyy-MM"),"yyyy-MM")); + query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now, "yyyy-MM"), "yyyy-MM")); break; } } - if(filter.getSort()==0) { + if (filter.getSort() == 0) { query.sortList = Arrays.asList(new String[]{"create_time asc"}); - }else{ + } else { query.sortList = Arrays.asList(new String[]{"create_time desc"}); } List<KeyOrder> list = keyOrderService.list(query); - List<KeyOrderVO> voList=new ArrayList<>(); - for(KeyOrder order:list){ + List<KeyOrderVO> voList = new ArrayList<>(); + for (KeyOrder order : list) { voList.add(OrderFactory.create(order)); } long count = keyOrderService.count(query); - JSONObject data=new JSONObject(); - data.put("count",count); - data.put("list",gson.toJson(voList)); + JSONObject data = new JSONObject(); + data.put("count", count); + data.put("list", gson.toJson(voList)); return JsonUtil.loadTrueResult(data); } @ResponseBody - @RequestMapping("setOrderNo") - public String setOrderNo(AcceptData acceptData, String id,String orderNo){ - loggerPay.info("setOrderNo: {}-{}",id,orderNo); - if(StringUtil.isNullOrEmpty(id)){ + @RequestMapping("setOrderNoV2") + public String setOrderNoV2(AcceptData acceptData, String id, String orderNoDesc, String orderStatus, String money) { + loggerPay.info("setOrderNo[{}]: {}-{}-{}-{}", acceptData.getUid(), id, orderNoDesc, orderStatus, money); + if (StringUtil.isNullOrEmpty(id)) { return JsonUtil.loadFalseResult("璇蜂笂浼爄d"); } - if(StringUtil.isNullOrEmpty(orderNo)){ - return JsonUtil.loadFalseResult("orderNo"); + if (StringUtil.isNullOrEmpty(money)) { + return JsonUtil.loadFalseResult("璇蜂笂浼爉oney"); } KeyOrder order = keyOrderService.selectById(id); - if(order==null){ + if (order == null) { return JsonUtil.loadFalseResult("鍙d护涓嶅瓨鍦�"); } - try { - if (order.getOrderNo() != null && !order.getOrderNo().equalsIgnoreCase(orderNo)) { - throw new KeyOrderException("宸茬粡澶勭悊杩囷紝涓庝箣鍓嶅鐞嗙殑璁㈠崟鍙蜂笉涓�鑷�"); - } - }catch(KeyOrderException e){ - return JsonUtil.loadFalseResult(e.getMessage()); + money = money.replace("楼", ""); + + int orderType = Constant.ORDER_TYPE_UNKNOWN; + + if (orderNoDesc.contains("鎶栭煶") || orderNoDesc.contains("涓婃捣鏍肩墿鑷村搧")) { + orderType = Constant.ORDER_TYPE_DY; + } else if (orderNoDesc.contains("蹇墜")) { + orderType = Constant.ORDER_TYPE_KS; } + String orderNo = ""; try { - DYOrderDto dto = new DYOrderDto(); // DYOrderApi.getOrderDetail(orderNo); - dto.setOrder_status(1); - if(dto.getOrder_status() !=DYOrderDto.ORDER_STATUS_NOT_PAY){ - KeyOrder orderUpdate=new KeyOrder(); - orderUpdate.setId(id); - orderUpdate.setOrderState(dto.getOrder_status()); - orderUpdate.setOrderType(1); - orderUpdate.setOrderNo(orderNo); - if(order.getState() == KeyOrder.STATE_NOT_PROCESS){ - orderUpdate.setState(KeyOrder.STATE_NOT_PAY); - orderUpdate.setStateDesc("璁㈠崟涓嶅浜庡緟浠樻鐘舵��"); - } - keyOrderService.update(orderUpdate); - if(dto.getOrder_status() ==DYOrderDto.ORDER_STATUS_CANCELED){ - throw new Exception("璁㈠崟宸插彇娑�"); - }else { - throw new Exception("璁㈠崟宸叉敮浠�"); - } + if (orderType == Constant.ORDER_TYPE_UNKNOWN) { + throw new KeyOrderException("鏈畾涔夌殑璁㈠崟绫诲瀷"); } + + if (!StringUtil.isNullOrEmpty(orderStatus)) { + throw new KeyOrderException(orderStatus); + } + + DYOrderDto dyOrderDto = null; + try { + // 楠岃瘉璁㈠崟鏄惁鍙互鏀粯 + dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money, null, null); + } catch (KeyVerifyException ve) { + throw new KeyOrderException("鍙d护楠岃瘉澶辫触锛�" + ve.getMessage()); + } +// if(dyOrderDto!=null&&order.getOrderMoney()!=null){ +// // 鍒ゆ柇璁㈠崟鏀粯閲戦涓庣敤鎴锋彁浜ょ殑閲戦鏄惁鍖归厤 +// if(dyOrderDto.getPay_amount()!=order.getOrderMoney().multiply(new BigDecimal(100)).setScale(0, RoundingMode.FLOOR).intValue()){ +// throw new KeyOrderException(String.format("璁㈠崟鎺ュ彛閲戦涓嶅尮閰嶏細%s-%s",dyOrderDto.getPay_amount(),MoneyUtil.getMoneyStr(order.getOrderMoney()))); +// } +// } + if (dyOrderDto != null) { + orderNo = dyOrderDto.getOrder_id(); + } + + OrderChannelEnum orderChannel = null; + if (dyOrderDto != null) { + orderChannel = OrderChannelUtil.getChannelByKey(dyOrderDto.getOrderChannel()); + } else { + orderChannel = OrderChannelEnum.unknown; + } + + // 楠岃瘉娓犻亾鏀粯娆℃暟鏄惁杈惧埌涓婇檺 + if (order.getUid() != null) { + payCountVerifyManager.verifyPayCount(order.getUid(), orderType, orderChannel); + } + // 璁剧疆杩涘叆 - KeyOrder orderUpdate=new KeyOrder(); + KeyOrder orderUpdate = new KeyOrder(); orderUpdate.setId(id); - orderUpdate.setOrderType(1); - orderUpdate.setOrderState(dto.getOrder_status()); + orderUpdate.setOrderType(orderType); orderUpdate.setOrderNo(orderNo); + orderUpdate.setOrderMoney(new BigDecimal(money)); + if (dyOrderDto != null) { + orderUpdate.setOrderState(dyOrderDto.getOrder_status()); + orderUpdate.setOrderChannel(dyOrderDto.getOrderChannel()); + orderUpdate.setPayType(Constant.PAY_TYPE_WITH_ORDER_NO); + } else { + orderUpdate.setPayType(Constant.PAY_TYPE_WITH_MONEY); + orderUpdate.setOrderChannel(OrderChannelEnum.unknown.getKey()); + } + orderUpdate.setExcutePayTime(new Date()); keyOrderService.update(orderUpdate); order = keyOrderService.selectById(id); + order.setPayType(orderUpdate.getPayType()); return JsonUtil.loadTrueResult(gson.toJson(OrderFactory.create(order))); + } catch (KeyOrderException e) { + loggerPay.info(String.format("璁剧疆璁㈠崟鍙峰嚭閿欙細%s-%s", id, e.getMessage())); + KeyOrder orderUpdate = new KeyOrder(); + orderUpdate.setId(id); + orderUpdate.setOrderType(orderType); + orderUpdate.setOrderNo(orderNo); + orderUpdate.setOrderMoney(new BigDecimal(money)); + orderUpdate.setOrderState(0); + orderUpdate.setState(KeyOrder.STATE_REJECT_PAY); + if (order.getExcutePayTime() == null) { + orderUpdate.setExcutePayTime(new Date()); + } + orderUpdate.setStateDesc(e.getMessage()); + keyOrderService.update(orderUpdate); + return JsonUtil.loadFalseResult(e.getMessage()); } catch (Exception e) { e.printStackTrace(); return JsonUtil.loadFalseResult(e.getMessage()); } } + /** + * @author hxh + * @description 璁剧疆鍟嗗鏄惁鍙敮浠� + * @date 1:26 2025/2/8 + * @param: acceptData + * @param: id + * @param: merchant + * @return java.lang.String + **/ + + @ResponseBody + @RequestMapping("isMerchantCanPay") + public String isMerchantCanPay(AcceptData acceptData, String id, String merchant) { + loggerPay.info("isMerchantCanPay[{}]: {}-{}", acceptData.getUid(), id, merchant); + // 鍒ゆ柇鏄惁涓哄崱閲戦 + KeyOrder keyOrder = keyOrderService.selectById(id); + if (keyOrder == null) { + return JsonUtil.loadFalseResult("璁㈠崟ID涓嶅瓨鍦�"); + } + OrderChannelEnum orderChannel = OrderChannelUtil.getChannelByKey(keyOrder.getOrderChannel()); + if (orderChannel != OrderChannelEnum.unknown) { + // 纭畾娓犻亾鐨勮鍗曞彲鐩存帴鏀粯 + return JsonUtil.loadTrueResult(""); + } + + // 鑾峰彇鍗¢噾棰濈殑璁剧疆淇℃伅 + PayMoneySetting payMoneySetting = payMoneySettingService.getSettingByMoney(keyOrder.getOrderMoney()); + if (payMoneySetting == null) { + keyOrderService.rejectPay(keyOrder.getId(),"浠樻閲戦涓嶅睘浜庡崱閲戦鑼冨洿"); + return JsonUtil.loadFalseResult("浠樻閲戦涓嶅睘浜庡崱閲戦鑼冨洿"); + } + if (payMoneySetting.getVerifyMerchantChannel() == null || payMoneySetting.getVerifyMerchantChannel() == OrderChannelEnum.unknown) { + // 娌℃湁璁剧疆鏍¢獙娓犻亾 + return JsonUtil.loadTrueResult(""); + } + + try { + // 鐩墠鍙垽鏂秴浜剑 + boolean isCanPay = OrderChannelApiUtil.isMerchantCanPay(payMoneySetting.getVerifyMerchantChannel(), merchant, keyOrder.getOrderMoney()); + if (isCanPay) { + // 閫氳繃鍟嗗鏍¢獙 + try { + payCountVerifyManager.verifyPayCount(keyOrder.getUid(), keyOrder.getOrderType(), payMoneySetting.getVerifyMerchantChannel()); + }catch (KeyOrderException ee){ + // 鎷掔粷鏀粯 + keyOrderService.rejectPay(keyOrder.getId(), ee.getMessage()); + return JsonUtil.loadFalseResult(ee.getMessage()); + }finally { + // 鏇存柊娓犻亾 + KeyOrder update = new KeyOrder(); + update.setId(keyOrder.getId()); + update.setOrderChannel(payMoneySetting.getVerifyMerchantChannel().getKey()); + keyOrderService.update(update); + } + return JsonUtil.loadTrueResult(""); + } else { + // 鏈�氳繃鍟嗗鏍¢獙 + keyOrderService.rejectPay(keyOrder.getId(),"鍟嗗鏍¢獙鏈�氳繃"); + return JsonUtil.loadFalseResult("鍟嗗鏍¢獙鏈�氳繃"); + } + } catch (UnsupportedEncodingException e) { + return JsonUtil.loadFalseResult(e.getMessage()); + } + } + + /** + * @return java.lang.String + * @author hxh + * @description 鏄惁鍙互鎵ц鏀粯 + * @date 0:22 2024/12/28 + * @param: acceptData + * @param: id + **/ + @ResponseBody + @RequestMapping("canExcutePay") + public String canExcutePay(AcceptData acceptData, String id) { + try { + KeyOrder keyOrder = keyOrderService.selectByIdForUpdate(id); + if (keyOrder == null) { + throw new Exception("璁㈠崟涓嶅瓨鍦�"); + } + if (keyOrder.getState() == KeyOrder.STATE_PAY) { + throw new Exception("璁㈠崟宸叉敮浠�"); + } + loggerPay.info("canExcutePay[{}]: {}-{}", acceptData.getUid(), id, "鍙互鏀粯"); + return JsonUtil.loadTrueResult(""); + } catch (Exception e) { + loggerPay.error("canExcutePay[{}]: {}-{}", acceptData.getUid(), id, "涓嶅彲浠ユ敮浠橈細" + e.getMessage()); + return JsonUtil.loadFalseResult(e.getMessage()); + } + } + + @ResponseBody @RequestMapping("setPayResult") - public String setPayResult(AcceptData acceptData, String id,boolean paySuccess,String msg){ - loggerPay.info("setPayResult: {}-{}",id,paySuccess); - if(StringUtil.isNullOrEmpty(id)){ + public String setPayResult(AcceptData acceptData, String id, boolean paySuccess, String msg, String payMerchant) { + loggerPay.info("setPayResult[{}]: {}-{}-{}-{}", acceptData.getUid(), id, paySuccess, msg, payMerchant); + if (StringUtil.isNullOrEmpty(id)) { return JsonUtil.loadFalseResult("璇蜂笂浼爄d"); } KeyOrder order = keyOrderService.selectById(id); - if(order==null){ + if (order == null) { return JsonUtil.loadFalseResult("鍙d护涓嶅瓨鍦�"); } - if(StringUtil.isNullOrEmpty(order.getOrderNo())){ - return JsonUtil.loadFalseResult("娌℃湁鍖归厤鍒拌鍗曞彿"); - } +// if (StringUtil.isNullOrEmpty(order.getOrderNo())) { +// return JsonUtil.loadFalseResult("娌℃湁鍖归厤鍒拌鍗曞彿"); +// } - if(!paySuccess){ - // 鏀粯澶辫触 - KeyOrder orderUpdate=new KeyOrder(); - orderUpdate.setId(id); - orderUpdate.setState(KeyOrder.STATE_NOT_PAY); - orderUpdate.setStateDesc("鏀粯澶辫触"); - keyOrderService.update(orderUpdate); - } else { - KeyOrder orderUpdate=new KeyOrder(); - orderUpdate.setId(id); - orderUpdate.setState(KeyOrder.STATE_PAY); - orderUpdate.setStateDesc("鏀粯鎴愬姛"); - keyOrderService.update(orderUpdate); + if (order.getState() == KeyOrder.STATE_NOT_PROCESS) { + if (!paySuccess) { + // 鏀粯澶辫触 + if (msg != null && msg.contains("瓒呮椂")) { + loggerPay.info(String.format("鍥犱负瓒呮椂鏀粯澶辫触涓嶅鐞嗭細%s-%s", order.getId(), msg)); + orderPayFailProcessor.processPayFail(order.getId(), msg); + } else { + KeyOrder orderUpdate = new KeyOrder(); + orderUpdate.setId(id); + orderUpdate.setState(KeyOrder.STATE_NOT_PAY); + orderUpdate.setStateDesc("鏀粯澶辫触锛�" + msg); + orderUpdate.setPayMerchant(payMerchant); + keyOrderService.update(orderUpdate); + } + loggerPay.info("澶勭悊鏀粯澶辫触瀹屾垚"); + } else { + try { + keyOrderService.paySuccess(id, "鏀粯鎴愬姛", TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT), payMerchant); + loggerPay.info("澶勭悊鏀粯鎴愬姛瀹屾垚"); + } catch (WxOrderCountException e) { + loggerPay.error(e.getMessage()); + e.printStackTrace(); + return JsonUtil.loadFalseResult(e.getMessage()); + } + } } return JsonUtil.loadTrueResult(""); } + @ResponseBody + @RequestMapping("rejectPay") + public String rejectPay(AcceptData acceptData, String id) { + loggerPay.info("rejectPay: {}-{}", acceptData.getUid(), id); + if (StringUtil.isNullOrEmpty(id)) { + return JsonUtil.loadFalseResult("璇蜂笂浼爄d"); + } + KeyOrder order = keyOrderService.selectById(id); + if (order == null) { + return JsonUtil.loadFalseResult("鍙d护涓嶅瓨鍦�"); + } + + if (order.getState() != KeyOrder.STATE_NOT_PROCESS) { + return JsonUtil.loadFalseResult("鍙兘椹冲洖鏈墽琛岀姸鎬佺殑鍙d护"); + } + + KeyOrder orderUpdate = new KeyOrder(); + orderUpdate.setId(id); + orderUpdate.setState(KeyOrder.STATE_REJECT_PAY); + orderUpdate.setStateDesc("浜哄伐椹冲洖"); + keyOrderService.update(orderUpdate); + + return JsonUtil.loadTrueResult(""); + } + @ResponseBody @RequestMapping("deleteAll") - public String deleteAll(AcceptData acceptData){ + public String deleteAll(AcceptData acceptData, Long uid) { + + ClientInfo user = clientInfoService.selectByPrimaryKey(uid); + if (user == null) { + return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"); + } + + if (user.getRule() != ClientInfo.RULE_ADMIN) { + return JsonUtil.loadFalseResult("鍙湁绠$悊鍛樻墠鑳藉垹闄�"); + } + + // 鍒犻櫎10澶╀箣鍓嶇殑鏁版嵁 + keyOrderService.deleteAll(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000L * 10)); +// keyOrderService.deleteAll(new Date(System.currentTimeMillis())); // 鍒櫎鎵�鏈夋暩鎿� return JsonUtil.loadTrueResult(""); } - public static void main(String[] args){ + public static void main(String[] args) { Calendar calendar = Calendar.getInstance(); - for(int i=0;i<7;i++) { - calendar.setTime(new Date(System.currentTimeMillis() - 24*60*60*1000L*i)); + for (int i = 0; i < 7; i++) { + calendar.setTime(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000L * i)); int day = calendar.get(Calendar.DAY_OF_WEEK); - System.out.println(day-1); + System.out.println(day - 1); } } } -- Gitblit v1.8.0