蜂巢未推单发货订单
正在显示
2 个修改的文件
包含
94 行增加
和
2 行删除
... | @@ -27,6 +27,7 @@ import com.sibu.orderHelper.service.mq.OrderMqService; | ... | @@ -27,6 +27,7 @@ import com.sibu.orderHelper.service.mq.OrderMqService; |
27 | import com.sibu.orderHelper.service.redis.RedisProductDetailService; | 27 | import com.sibu.orderHelper.service.redis.RedisProductDetailService; |
28 | import com.sibu.orderHelper.service.redis.RedisProductSkuService; | 28 | import com.sibu.orderHelper.service.redis.RedisProductSkuService; |
29 | import org.apache.commons.collections.CollectionUtils; | 29 | import org.apache.commons.collections.CollectionUtils; |
30 | import org.apache.commons.jexl2.internal.AbstractExecutor; | ||
30 | import org.apache.commons.lang3.StringUtils; | 31 | import org.apache.commons.lang3.StringUtils; |
31 | import org.apache.log4j.Logger; | 32 | import org.apache.log4j.Logger; |
32 | import org.springframework.beans.factory.annotation.Autowired; | 33 | import org.springframework.beans.factory.annotation.Autowired; |
... | @@ -588,7 +589,7 @@ public class IMOrderController extends BaseController { | ... | @@ -588,7 +589,7 @@ public class IMOrderController extends BaseController { |
588 | * 获取订单赠送的优惠券信息 | 589 | * 获取订单赠送的优惠券信息 |
589 | * | 590 | * |
590 | * @param imOrderId | 591 | * @param imOrderId |
591 | * @return | 592 | * @return sbjt |
592 | */ | 593 | */ |
593 | @RequestMapping(value = "/getShareOrderCoupon/{imOrderId}", method = RequestMethod.GET) | 594 | @RequestMapping(value = "/getShareOrderCoupon/{imOrderId}", method = RequestMethod.GET) |
594 | public CommonResponse<UserCouponResponse> getShareOrderCoupon(@PathVariable String imOrderId) { | 595 | public CommonResponse<UserCouponResponse> getShareOrderCoupon(@PathVariable String imOrderId) { |
... | @@ -600,5 +601,94 @@ public class IMOrderController extends BaseController { | ... | @@ -600,5 +601,94 @@ public class IMOrderController extends BaseController { |
600 | return ResponseRender.renderErrData("无法获取优惠券信息"); | 601 | return ResponseRender.renderErrData("无法获取优惠券信息"); |
601 | } | 602 | } |
602 | 603 | ||
604 | @RequestMapping(value = "/updateOrderStatus",method = RequestMethod.GET) | ||
605 | public String updateOrderStatus(String str) throws Exception { | ||
606 | try { | ||
607 | if(StringUtil.isNull(str)){ | ||
608 | return ResponseUtil.error("请输入验证码"); | ||
609 | } | ||
610 | if(!"056839532496493e933a6e2ece2fb749".equals(MD5Util.MD5ToNewWeSale(str))){ | ||
611 | return ResponseUtil.error("请输入正确验证码"); | ||
612 | } | ||
613 | }catch (Exception e){ | ||
614 | log.error(e); | ||
615 | throw new ApiDataException(2, "md5错误", e); | ||
616 | } | ||
617 | ArrayList<String> list = new ArrayList<String>(Arrays.asList("S001201803301500393468","S002201803310636496522", | ||
618 | "S003201803311950134448","S003201804021726103726","S008201804012318154144","S009201803301717014582", | ||
619 | "S009201804031742158368","S010201803302243594165","S010201803310655255716","S010201803311445274514", | ||
620 | "S011201804010551445087","S012201804031317247560","S013201803301449528774","S013201803311805245364", | ||
621 | "S013201804011948278116","S014201804031112591832","S015201804022250135312","S016201803301534038323", | ||
622 | "S018201803301539037314","S018201804032207450067","S019201803311415377772","S021201804020822173035", | ||
623 | "S022201804031751034538","S024201804012157592786","S024201804022120153016","S025201804031600562780", | ||
624 | "S027201803301124226458","S027201803301449463046","S027201804020613407512","S028201804011532383452", | ||
625 | "S029201803301342144361","S030201804021915166557","S030201804030943221036","S030201804031704252280", | ||
626 | "S031201804032022113150","S032201803300142467716","S032201804022054446327","S032201804022152336100", | ||
627 | "S033201803301306054181","S033201803301604344630","S033201804022051552617","S034201803311405235661", | ||
628 | "S034201804041110054110","S034201804041112071033","S035201804021306251564", | ||
629 | "S035201804022134394484","S035201804022155253040","S036201804021700023086","S037201803310830528445", | ||
630 | "S037201804031410032630","S038201803312239558477","S039201804031224113738","S041201803301850202686", | ||
631 | "S043201803292327108478","S043201804031558017738","S044201803300144397008","S045201804022009022507", | ||
632 | "S047201804021718562127","S047201804022309130346","S048201803301140215480","S048201803311839282657", | ||
633 | "S048201804030252467144","S050201804022205166020","S051201803301329584332","S051201804021558185004", | ||
634 | "S052201804031521035024","S052201804041403024048","S053201804031720507572","S054201803300810201872", | ||
635 | "S055201803300252474468","S056201803301846008508","S056201803311457588567","S056201804032214552765", | ||
636 | "S063201804030851375687","S065201804021316052644","S066201804022153170214","S066201804032327583423", | ||
637 | "S068201803301433144776","S068201803301924008465","S068201804011833346441", | ||
638 | "S068201804032221391520","S069201804021755185870","S070201804022239485716","S071201804031905418028", | ||
639 | "S072201803301622530517","S072201803312129060666","S074201804020633294138","S077201804022127176426", | ||
640 | "S078201803300813576038","S078201803312153525747","S079201804021343565246","S079201804041117434285", | ||
641 | "S080201804041132563830","S082201804031444012878","S084201803300715062453","S084201803302258453526", | ||
642 | "S084201804030814073074","S084201804042038236218","S085201803300729122822","S085201804031752390125", | ||
643 | "S087201804021421541813","S090201804020808268073","S091201803311654395140","S092201804030841464060", | ||
644 | "S093201804021359023336","S094201804021502564773","S094201804032157291826","S095201804021717217712", | ||
645 | "S096201803300756394627","S096201804011726374818","S097201803292109065432","S097201803300934487387", | ||
646 | "S099201804030947056520","S100201804032216452257","S101201804030840344121", | ||
647 | "S106201803301541563573","S106201804032233030773","S110201803300013383453","S110201804030145075587", | ||
648 | "S113201803310028275206","S113201803310034083450","S113201803311313207366","S114201803300007491555", | ||
649 | "S115201804032211300405","S118201803311859048617","S119201804031557166838","S120201804021541582655", | ||
650 | "S121201804021857200325","S123201803292219393748","S124201804041842345837","S126201803300919241222", | ||
651 | "S126201804032149432027","S127201804022046185255","S127201804031633331641","S127201804031847340757", | ||
652 | "S128201803311217261082","S128201804022159406731","S131201804081216092545","S132201803301258091520", | ||
653 | "S132201804022214411053","S134201804020949477177","S135201804031710564457","S135201804032242247532", | ||
654 | "S135201804032245211632","S136201804031612158511","S140201804041033577167","S141201804021022393456", | ||
655 | "S142201803301436063146","S144201804021132336154","S144201804041303165788","S145201803311818001021", | ||
656 | "S146201803301417332520","S147201803292332391002","S147201803300930018125","S147201803301934492771", | ||
657 | "S150201803292137341873","S150201804021342185575","S151201803301734236010","S151201803310752485002", | ||
658 | "S151201804011610323632","S152201804040949223753","S153201804022008197614","S156201803302123086530", | ||
659 | "S156201803311616061777","S156201803312253091467","S157201803301335241053","S158201804040458020516", | ||
660 | "S159201804011238398008","S160201804021802195257","S161201803301714447016","S161201803311337562865", | ||
661 | "S162201803301405295307","S162201804021737346501","S162201804021739428364","S163201803311605110450", | ||
662 | "S163201804031018363670","S164201803301801472081","S164201803311646346378","S165201803311600058141", | ||
663 | "S167201804041041062845","S171201804021220552438","S171201804030008090160","S171201804030012530712", | ||
664 | "S171201804030016266178","S172201804030904061281","S173201804011222120156","S175201803311545354362", | ||
665 | "S176201804012308324631","S176201804022016511003","S177201803292251447543","S177201804021413102776", | ||
666 | "S178201804010540176208","S180201803312156212706","S181201803292215035637","S181201803301733314235", | ||
667 | "S183201803300854191563","S183201804021506511184","S183201804022150565414","S185201803310748075361", | ||
668 | "S186201804010757290482","S187201803311000050747","S191201803300115122335","S191201804040916240343", | ||
669 | "S193201803311239151683","S196201803301407424751","S197201804011450143808","S197201804030557255320", | ||
670 | "S198201803302018066214","S198201803311855081682","S198201804021632518378","S198201804030831431015", | ||
671 | "S199201804031335183156","S200201803301710175703","S200201803302156407364","S200201803310816187862", | ||
672 | "S201201804011026006648","S203201803300139363157","S203201803301317572018","S203201804022057156156", | ||
673 | "S204201804031655110008","S204201804041435572405","S205201804101501353885","S208201803311830597317", | ||
674 | "S208201804041609543764","S210201803301242047657","S210201804011249281277","S210201804031010533178", | ||
675 | "S212201803300850480148","S212201804011331211637","S212201804031704028843","S213201804032134114402", | ||
676 | "S214201803301318348701","S215201803311855005560","S215201804041001323208","S216201804021251530724", | ||
677 | "S216201804030940217228","S217201804030830376751","S219201803311325535578","S219201804022059368818", | ||
678 | "S221201803300947008817","S221201803301729020320","S221201804021233095832","S221201804021630427237", | ||
679 | "S222201804010006245583","S222201804021043518147","S222201804021505218564","S224201803301309448786", | ||
680 | "S225201804032008531716","S226201804041802084514","S228201803300014218278","S228201804020943006024", | ||
681 | "S232201804020948250355","S233201803300903367460","S234201804022311466705","S235201804041938297324", | ||
682 | "S236201804041245408720","S237201803311354334845","S237201804021739034080","S238201803292234194864", | ||
683 | "S238201804021232320416","S238201804021340412055","S238201804031212070002","S239201803311653386723", | ||
684 | "S239201804021346270232","S240201804021251510363","S240201804031413380805","S242201803300950360373", | ||
685 | "S242201803302031406582","S244201803301524003743","S244201803301703314165","S244201804022138196646", | ||
686 | "S244201804031022457551","S245201804032109042117","S246201804022209482307","S246201804061309110866", | ||
687 | "S248201804030644468786","S251201804041024505766","S253201804010908218430","S254201804030213087543", | ||
688 | "S254201804041921315086","S255201804082316034027")); | ||
689 | iMDoingOrderService.updateRefundOrderList(list); | ||
690 | return ResponseUtil.success("更新成功"); | ||
691 | } | ||
692 | |||
603 | 693 | ||
604 | } | 694 | } | ... | ... |
... | @@ -852,7 +852,9 @@ | ... | @@ -852,7 +852,9 @@ |
852 | </select> | 852 | </select> |
853 | 853 | ||
854 | <update id="updateOrderStatusByMap" parameterType="java.util.Map"> | 854 | <update id="updateOrderStatusByMap" parameterType="java.util.Map"> |
855 | update ${doingOrderTable} set order_status = 7 WHERE order_code = #{orderCode} | 855 | update ${doingOrderTable} set order_status = 7, |
856 | seller_remark='线下已退款处理,线上人工修改订单状态为退款成功' | ||
857 | WHERE order_code = #{orderCode} | ||
856 | </update> | 858 | </update> |
857 | 859 | ||
858 | </mapper> | 860 | </mapper> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
请 注册 或 登录 后发表评论