Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -11,7 +11,6 @@ import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
-import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
@@ -209,7 +208,7 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList) {
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
 
         ResponseBean responseBean = new ResponseBean();
@@ -523,10 +522,10 @@ public class TaRaiseRecordController extends BaseController {
             taRaise.setRaisePrice(taRaise.getRaisePrice());
             //置业顾问信息
             TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
-            if (null != consultantInfo) {
+            if (null != consultantInfo){
                 //职业顾问信息
                 TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
-                if (null != consultantPerson) {
+                if (null != consultantPerson){
                     consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
                 }
             }
@@ -548,7 +547,7 @@ public class TaRaiseRecordController extends BaseController {
                 });
 
                 //塞入户型信息
-                if (!StringUtils.isEmpty(e.getApartmentId())) {
+                if (!StringUtils.isEmpty(e.getApartmentId())){
                     TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
                     e.setApartmentName(buildingApartment.getApartmentName());
                     e.setInsideArea(buildingApartment.getInsideArea());
@@ -556,17 +555,20 @@ public class TaRaiseRecordController extends BaseController {
                 }
             });
 
+            Map<String, Object> map = new HashMap<>();
+            map.put("refundOrder", null);
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
-            //退费信息
-            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
-
-            Map<String, Object> map = new HashMap<>();
+            if (null != taOrder){
+                //退费信息
+                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id",taOrder.getOrderId()));
+                map.put("refundOrder", refundOrder);
+            }
             map.put("taRaiseRecord", taRaiseRecord);
             map.put("taRaiseHouseList", taRaiseHouseList);
             map.put("houseList", houseList);
             map.put("taOrder", taOrder);
-            map.put("refundOrder", refundOrder);
+
             map.put("taRaise", taRaise);
             responseBean.addSuccess(map);
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/controller/WxPayController.java

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaWxPayConfig;
 import com.huiju.estateagents.service.ITaWxPayConfigService;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -117,7 +118,7 @@ public class WxPayController extends BaseController {
      */
     @RequestMapping(value = "/refund/{type}",method = RequestMethod.POST)
     public String wxRefund(@PathVariable String type, HttpServletRequest request){
-        log.info("支付成功回调开始，支付类型是{}",type);
+        log.info("微信退款成功回调开始，退款类型是{}",type);
         String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
         String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
         Map<String, String> resultMap = new HashMap<>();
@@ -140,15 +141,17 @@ public class WxPayController extends BaseController {
             // xml转换为map
             resultMap = WXPayUtil.xmlToMap(result);
             //处理业务需求
-            if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("return_code"))) {
                 String mchId = resultMap.get("mch_id");
                 QueryWrapper<TaWxPayConfig> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("mch_id",mchId);
                 String mchKey = taWxPayConfigService.list(queryWrapper).get(0).getMchKey();
-                SecretKeySpec key = new SecretKeySpec(MD5Utils.md5(mchKey, "UTF-8").toLowerCase().getBytes(), "AES");
+                log.info("key等于{}",mchKey);
+                SecretKeySpec key = new SecretKeySpec(DigestUtils.md5Hex(mchKey).toLowerCase().getBytes(), "AES");
                 Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
                 cipher.init(Cipher.DECRYPT_MODE, key);
                 String req_info = new String(cipher.doFinal(new BASE64Decoder().decodeBuffer(resultMap.get("req_info"))), "UTF-8");
+                log.info("req_info等于{}",req_info);
                 Map<String, String> orderInfo = WXPayUtil.xmlToMap(req_info);
                 wxPayService.houseRefund(orderInfo);
             }else {

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -191,6 +191,7 @@ public class WxPayServiceImpl implements IWxPayService {
      */
     @Override
     public void houseRefund(Map<String, String> orderInfo) {
+        log.info("更新订单{}状态为退款",orderInfo.get("transaction_id"));
         //更新订单状态为退款
         String transactionId = orderInfo.get("transaction_id");
         List<TaOrder> orderList = taOrderMapper.selectList(new QueryWrapper<TaOrder>().eq("transaction_id", transactionId));
@@ -276,6 +277,11 @@ public class WxPayServiceImpl implements IWxPayService {
             if (null == taRaiseRecord){
                 throw new Exception("此认筹单不存在！请联系置业顾问！");
             }
+            //判断是否是已经退费过的单子
+            TaOrder parentOrder = taOrderMapper.selectOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taRaiseRecord.getOrderId()));
+            if (null != parentOrder){
+                throw new Exception("此认筹单已经退费！");
+            }
             //获取订单中的价格
             TaOrder refundOrder = taOrderMapper.selectById(taRaiseRecord.getOrderId());
             //退款单号

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -1,10 +1,17 @@
 package com.huiju.estateagents;
 
+import com.huiju.estateagents.common.wxpay.WXPayUtil;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
+import sun.misc.BASE64Decoder;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.Map;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -13,6 +20,19 @@ public class WxPayTest {
 
     @Test
     public void getLocationCity() {
-//        System.out.println(System.currentTimeMillis());
+//        try {
+//            String abc = "<xml><return_code>SUCCESS</return_code><appid><![CDATA[wxbbb069a341055ef0]]></appid><mch_id><![CDATA[1577983541]]></mch_id><nonce_str><![CDATA[3d8740137b51c5980b2048a105beb708]]></nonce_str><req_info><![CDATA[5RjGrqrAbzRvah2pEMp1QjCQavhY16xZhke159cIIap/UlJqUj0HSpFHGhlxp03Spbhb5I7WFdUqUErX8NOF7Wp4B/t06xYDvu+/KOVVtjHxvHijGfRIn9LTXPdDqJePFg/ZeYbZUYSUoqHygMSw8O+itBnlipxxh+bUPuTZro1/ydaiTC7gCcKTLkT1Njx6ctrPUC+IcukGVOzpnHy4tSfrt8mMpeGGrKVnmTDZxPBVbfGFebkir32wU4JfBpbpGmS0HDS8i8uq1qW8hnrDufIdcqzio7uMeM/ClTU5jy2Ez4SA7Ks21iObx0gNXMfnEDBKYJsw58R3V7aSf8VS2gWTSn/2QFxmzrSoMH3/bBKvY+LfOsSkis+ZvnMd4baYrRoIzGUkfmE2QXxzupN4404folIyuJ2xB1ewLRK7BTU6MRjPhg9jcEIAVWyoTp04Alek3xLzMILvMzGr0tOdIIqXYKs+7FAcuXgiqpvyw6yVF1l3Xj/IorXLSpfeFqycUUTr4uH7Rm8eCdFDt6YTSVaMRLWNWUBTC8BW4JlpimuXYYMeqrjY0MaJceiN5ZHoIGFmqnml/Tpzcwyb2j6tk5oaEIHlYVAJmsFmL6RLTPFDlUTOOEFAnZ1+wUqxSO0Z6cwcZgIioL1OPS2DC5c2Vi/FEgt8vu1HMn2wClH+R9kDu3fx9TqP8sfG1W89TQP1/s+oQvNdtFJKacGCVeSJ5Fc4pF1zRCStOGOoIAtEf7ub7VitKelYuABPc8P0dzgoLsBPUwFgrx+QrDMzyp8zICK8bzIqqFp+x+1RSN5Q7i8gvh4vWKuajST3F74L+zkQ9r2pEaZ/zWIUHx+xWDb8nw9hMlR4oER+ITASgsqP1PAFpRrHNFl3kV6p5V9Cp5LEVfch+yCS1f/cfcY3KiY4KYBB2jNe+nr/cq5Aq1ijujNERBpjDzJaaJiVcPBKSkcAwk0wPTqYk4ihDlUQ8XTgrfEKje1acdKiA3/t4ltHdG0vGVTKXwteHdnRggBUwELzQFLrPpbx1M2lxBlc8zkm08WLP+DW+rx09ZcyQMCBTFk=]]></req_info></xml>";
+//            Map resultMap = WXPayUtil.xmlToMap(abc);
+//            SecretKeySpec key = new SecretKeySpec(DigestUtils.md5Hex("RGiWajOfaw3Zl7TUIoQNjmEKA8VG8ZNL").toLowerCase().getBytes(), "AES");
+//            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+//            cipher.init(Cipher.DECRYPT_MODE, key);
+//            String req_info = new String(cipher.doFinal(new BASE64Decoder().decodeBuffer(resultMap.get("req_info").toString())), "UTF-8");
+//
+//            Map<String, String> orderInfo = WXPayUtil.xmlToMap(req_info);
+//            System.out.println(orderInfo);
+//        }catch (Exception e) {
+//            e.printStackTrace();
+//        }
+
     }
 }