Browse Source

Merge remote-tracking branch 'origin/master'

ritchie 2 years ago
parent
commit
1b329a6873

+ 0 - 1
src/main/java/com/szwl/controller/IndexController.java

@@ -1903,7 +1903,6 @@ public class IndexController { ;
      * type(类型,0:外门,1:内门),
      * status(状态:0:关闭,1:开启)
      * @param clientId
-
      * @return status(状态:0:关闭,1:开启)
      */
     @GetMapping("/updateEquipmentStatus")

+ 3 - 1
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -184,6 +184,8 @@ public class TEquipmentController {
                 equipmentDTO.setStick(equipmentDesc.getStick());
                 equipmentDTO.setWhiteSugar(equipmentDesc.getWhiteSugar());
                 equipmentDTO.setSleepDesc(equipmentDesc.getSleepDesc());
+                equipmentDTO.setOutDoor(equipmentDesc.getOutDoor());
+                equipmentDTO.setInDoor(equipmentDesc.getInDoor());
             }
 
         }
@@ -413,7 +415,7 @@ public class TEquipmentController {
         message[1]=equipment.getMessageReceiver2();
         message[2]=equipment.getMessageReceiver3();
         if(message.length>0){
-            oldEquipment.setMessageReceiver(message.toString());
+            oldEquipment.setMessageReceiver(message[0] + "," + message[1] + "," + message[2]);
         }
         tEquipmentService.updateById(oldEquipment);
         String channel = oldEquipment.getChannel();

+ 10 - 1
src/main/java/com/szwl/controller/TOrderController.java

@@ -88,7 +88,16 @@ public class TOrderController {
                             .setData("订单非支付状态")
                             .setMessage("订单非支付状态"));
         }
-
+        //判断是不是直连微信退款
+        if(StringUtils.isNotEmpty(order.getPayPlatform())&&order.getPayPlatform().equals("3")){
+            String ifSuccess = R.getDataIfSuccess(payFeign.refund(order.getSn(),refusePrice));
+            return ResponseEntity
+                    .status(HttpStatus.OK)
+                    .body(new ResultMessage()
+                            .setCode(true)
+                            .setData(ifSuccess)
+                            .setMessage(ifSuccess));
+        }
 //        TAdmin admin = tAdminService.selectEntityById(order.getAdminId());
 //		if(admin.getIsRefund()!=null&&admin.getIsRefund().equals("0")){
 ////			return JsonMessage.error("机器设定不退款");

+ 3 - 0
src/main/java/com/szwl/feign/bean/PayFeign.java

@@ -23,6 +23,9 @@ public interface PayFeign {
     ResponseModel<?> addOrder(@RequestBody TOrder order);
     @GetMapping("/tOrder/getOrder")
     ResponseModel<TOrder> getOrder(@RequestParam String id);
+    //直连微信退款
+    @GetMapping("/tWeixinPay/refund")
+    ResponseModel<String> refund(@RequestParam(value = "sn") String sn,@RequestParam(value = "refusePrice") BigDecimal refusePrice);
     @PostMapping("/tOrder/updateOrder")
     ResponseModel<?> updateOrder(@RequestBody TOrder order);
 //    @GetMapping("/tOrder/tradeServiceUniPay")

+ 1 - 1
src/main/java/com/szwl/model/entity/TOrder.java

@@ -107,7 +107,7 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "标记;")
     private String note;
 
-    @ApiModelProperty(value = "支付平台; 0或null为汇聚,1为杉德支付")
+    @ApiModelProperty(value = "支付平台; 0或null为汇聚,1为杉德支付,2为直接对接微信支付平台")
     private String payPlatform;
 
     @ApiModelProperty(value = "是否结算;0或null为未结算,1已结算。仅杉德支付有这个")