BUG修改

src/main/java/com/ygj/yuemum/service/admin/JlAdminUserService.java

@@ -69,11 +69,8 @@ public class JlAdminUserService {
 
     public int updateUser(JlAdminUser jladminusers) {
         try{
-            JlAdminUser jlAdminUser = new JlAdminUser();
-            jlAdminUser.setPassword(jladminusers.getPassword());
-            jlAdminUser.setUsername(jladminusers.getUsername());
-            int check = jladminuserdao.logIN(jlAdminUser);
-            if(check != 1) {
+            JlAdminUser jlAdminUser = jladminuserdao.selectByPrimaryKey(jladminusers.getId());
+            if(!jlAdminUser.getPassword().equals(jladminusers.getPassword())) {
                 return 2;
             } else {
                 jladminusers.setPassword(jladminusers.getNpwd());

src/main/java/com/ygj/yuemum/service/order/YSOrderReturnService.java

@@ -1,25 +1,39 @@
 package com.ygj.yuemum.service.order;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.dao.order.YSOrderDao;
 import com.ygj.yuemum.dao.order.YSOrderReturnDao;
 import com.ygj.yuemum.domain.maternitymatron.MmStock;
 import com.ygj.yuemum.domain.order.YSOrder;
 import com.ygj.yuemum.domain.order.YSOrderReturn;
+import com.ygj.yuemum.service.global.PackagesService;
 import com.ygj.yuemum.service.maternitymatron.MmStockService;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class YSOrderReturnService {
+    public static final String extracttemplateid = Constant.MDJAPIURL;
+    @Autowired
+    private YSOrderDao YSOrderDao;
     @Autowired
     private YSOrderReturnDao ysOrderReturnDao;
     @Autowired
     private YSOrderDao ysOrderDao;
     @Autowired
     private MmStockService mmStockService;
+    @Autowired
+    private PackagesService packagesService;
 
     public int insertYSOrderReturn (YSOrderReturn ysOrderReturn) {
         try {
+            YSOrder ysOrder = YSOrderDao.selectByOdNo(ysOrderReturn.getOd_no());
             ysOrderReturnDao.insertSelective(ysOrderReturn);
             //更新订单状态为9
             YSOrder returnYSOrder = new YSOrder();
@@ -32,6 +46,27 @@ public class YSOrderReturnService {
             mmStock.setOrderno(ysOrderReturn.getOd_no());
             mmStockService.deleteOrderStock(mmStock);
             //删除介绍人
+            //调用CRM成为介绍人
+            HttpPost httpPost = new HttpPost(extracttemplateid);
+            CloseableHttpClient client = HttpClients.createDefault();
+            String respContent = null;
+            JSONObject jsonParam = new JSONObject();
+            jsonParam.put("odCityCode", ysOrder.getOd_cityid());
+            jsonParam.put("odAmount", ysOrder.getOd_order_amount());
+            jsonParam.put("odNo", ysOrder.getOd_no());
+            jsonParam.put("odPhone", ysOrder.getOd_phone());
+            jsonParam.put("odStatus", 99);
+            jsonParam.put("odIntroducerPhone", ysOrder.getOd_introducer_phone());
+            jsonParam.put("odProductLine", "ys");
+            jsonParam.put("odProduct", packagesService.getPackageCRMCode(String.valueOf(ysOrder.getOd_product_id())));
+            StringEntity entity = new StringEntity(jsonParam.toString(),"utf-8");//解决中文乱码问题
+            entity.setContentEncoding("UTF-8");
+            entity.setContentType("application/json");
+            httpPost.setEntity(entity);
+            HttpResponse resp = client.execute(httpPost);
+            if(resp.getStatusLine().getStatusCode() != 200) {
+                return 0;
+            }
 
         }catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -8,6 +8,7 @@ import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
 import com.ygj.yuemum.dao.order.YSOrderDao;
 import com.ygj.yuemum.domain.distributionchannel.DcIntroduceLog;
 import com.ygj.yuemum.domain.distributionchannel.DcIntroducer;
+import com.ygj.yuemum.domain.global.Packages;
 import com.ygj.yuemum.domain.maternitymatron.MmStock;
 import com.ygj.yuemum.domain.order.YSOrder;
 import com.ygj.yuemum.domain.order.YSOrderServiceLog;
@@ -238,12 +239,14 @@ public class YSOrderService {
                     dcIntroducerNew.setWv_contract_count(0);
                     dcIntroducerService.insertDcIntroducer(dcIntroducerNew);
                     //调用CRM成为介绍人
+                    Packages packages = packagesService.getPackageDetail(String.valueOf(ysOrder.getOd_product_id()));
+                    float odMdAmount = packages.getP_amount() - ysOrder.getOd_other_discount() - ysOrder.getOd_mgm_discount() - ysOrder.getOd_promotion_discount();
                     HttpPost httpPost = new HttpPost(extracttemplateid);
                     CloseableHttpClient client = HttpClients.createDefault();
-                    String respContent = null;
                     JSONObject jsonParam = new JSONObject();
                     jsonParam.put("odCityCode", ysOrder.getOd_cityid());
                     jsonParam.put("odAmount", ysOrder.getOd_order_amount());
+                    jsonParam.put("odMdAmount", odMdAmount);
                     jsonParam.put("odNo", ysOrder.getOd_no());
                     jsonParam.put("odPhone", ysOrder.getOd_phone());
                     jsonParam.put("odStatus", 2);
@@ -305,7 +308,10 @@ public class YSOrderService {
                     respContent = EntityUtils.toString(he,"UTF-8");
                     org.json.JSONObject jsonObject = new org.json.JSONObject(respContent);
                     int introducerGradeId = jsonObject.getJSONObject("data").getInt("introducerGradeId");
-                    String pm_type = jsonObject.getJSONObject("data").getString("introducerActivityType");
+                    String pm_type = "";
+                    if (!jsonObject.getJSONObject("data").isNull("introducerActivityType")) {
+                        pm_type = jsonObject.getJSONObject("data").getString("introducerActivityType");
+                    }
                     float xul_rebateamount = jsonObject.getJSONObject("data").getInt("rebateAmount");
                     //介绍人日志
                     DcIntroduceLog dcIntroduceLog = new DcIntroduceLog();

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

@@ -54,9 +54,9 @@
         select tb.eh_code,
             fgetequipmenttypename(tb.et_type) et_type,
             tb.ed_emcode,
-            tb.ed_startdate,
+            DATE_FORMAT(tb.ed_startdate, '%Y.%m.%d') ed_startdate,
             fgetequipmentrent(et_type)  ei_rent,
-            tb.ed_enddate,
+            DATE_FORMAT(tb.ed_enddate, '%Y.%m.%d') ed_enddate,
             ta.eh_mortagage,
             fgetequipmenturl(tb.et_type) equipmenturl,
             ta.eh_status