crud

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireHeadController.java

@@ -66,8 +66,11 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
     }
 
-    @PostMapping("/WxPayReturn")
-    public int WxPayReturn(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+    @RequestMapping(value = "/WxPayReturn", method = RequestMethod.POST, produces="application/json;charset=UTF-8")
+    @ResponseBody
+    public int WxPayReturn(@RequestBody Map<String,String> params) {
+        EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
+        equipmenteHireHead.setEh_code(params.get("eh_code"));
         equipmenteHireHead.setEh_status(2);
         return equipmenteHireHeadService.updateEqorderStatus(equipmenteHireHead);
     }

src/main/java/com/ygj/yuemum/service/global/WeChatInfoService.java

@@ -60,7 +60,6 @@ public class WeChatInfoService {
     public static String JSCODE2SESSION = "https://api.weixin.qq.com/sns/jscode2session";
 
     public static String SENDMESSAGEURL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
-    public static String SENDOPENID = "oAjHTv9I4j1_D_BfIzBaj1bbYU9s";
     public static String OrderTemplateid = "VyMPKDDGOy85wDIJuXR7sBuiIBEg0OPaCg6C_Dt_D0g";
     public static String BookingTemplateid = "Wvysqh3Ec9lXpf5tytq0T2zzs662uowNLFCPiAPBFkA";
 
@@ -76,11 +75,15 @@ public class WeChatInfoService {
 
     public int WXSendOrderMessage(String orderno, String total, String date) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
-        WechatTemplate wechatTemplate = new WechatTemplate();
-        wechatTemplate.setTemplate_id(OrderTemplateid);
-        wechatTemplate.setTouser(SENDOPENID);
 
+        String resultToken = sendGet("http://yuesuo.yueguanjia.com/modoo-1/getWxPublicSender");
+        Map mapToken = JSON.parseObject(resultToken);
+        String openid = String.valueOf(mapToken.get("wp_openid"));
         Map<String,TemplateData> mapdata = new HashMap<>();
+
+        WechatTemplate wechatTemplate = new WechatTemplate();
+        wechatTemplate.setTemplate_id(OrderTemplateid);
+        wechatTemplate.setTouser(openid);
         // 封装模板数据
         TemplateData first = new TemplateData();
         first.setValue("用户设备租赁单在线支付成功！");
@@ -126,9 +129,12 @@ public class WeChatInfoService {
     }
     public int WXSendBookingMessage(CustomerBooking customerBooking) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
+        String resultToken = sendGet("http://yuesuo.yueguanjia.com/modoo-1/getWxPublicSender");
+        Map mapToken = JSON.parseObject(resultToken);
+        String openid = String.valueOf(mapToken.get("wp_openid"));
         WechatTemplate wechatTemplate = new WechatTemplate();
         wechatTemplate.setTemplate_id(BookingTemplateid);
-        wechatTemplate.setTouser(SENDOPENID);
+        wechatTemplate.setTouser(openid);
 
         Map<String,TemplateData> mapdata = new HashMap<>();
         // 封装模板数据
@@ -305,6 +311,7 @@ public class WeChatInfoService {
         return UUID.randomUUID().toString();
     }
 
+
     public static String sendGet(String url) {
         String result = "";
         StringBuilder jsonStr = new StringBuilder();
@@ -354,7 +361,6 @@ public class WeChatInfoService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        System.out.println(str);
         return str;
     }
     public static String decrypt(String data, String key, String iv, String encodingFormat) throws Exception {

src/main/resources/mybatis/mapper/customer/CustomerBookingMapper.xml

@@ -40,6 +40,7 @@
         <if test="bk_duedate != null and bk_duedate != ''">
             and bk_duedate = #{bk_duedate,jdbcType=INTEGER}
         </if>
+        order by 1 desc
     </select>
 
     <select id="checkBooking" resultType="java.lang.Integer" parameterType="com.ygj.yuemum.domain.customer.CustomerBooking">

src/main/resources/mybatis/mapper/equipment/EquipmenteHireDetailMapper.xml

@@ -63,6 +63,7 @@
         from equipment_hire_detail tb ,equipment_hire_head ta
         where tb.eh_code = ta.eh_code
         and eh_cmidcard = #{eh_cmidcard,jdbcType=VARCHAR}
+        and ta.eh_status != 1
         order by  FIELD(ta.eh_status , 2,9,4) , ta.id desc
     </select>
 

src/main/resources/mybatis/mapper/equipment/EquipmenteHireHeadMapper.xml

@@ -35,7 +35,7 @@
             equipment_hire_head
         order by eh_date desc ,
         eh_status asc,
-        eh_code desc
+        id desc
     </select>
 
     <select id="getSeq" resultType="java.lang.Integer" >
@@ -111,7 +111,7 @@
         ORDER BY
         equipment_hire_head.eh_date desc,
         equipment_hire_head.eh_status ASC,
-        equipment_hire_head.eh_code desc
+        equipment_hire_head.id desc
     </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >