java/zhihuishenqu.git

			@@ -9,10 +9,13 @@
			import java.util.concurrent.atomic.AtomicBoolean;
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;

			import com.alibaba.fastjson.JSONObject;
			import com.panzhihua.applets.config.MinioUtil;
			import com.panzhihua.applets.umf.UmfPayUtil;
			import com.panzhihua.applets.unionpay.*;
			import com.panzhihua.common.controller.BaseController;
			import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
			import com.panzhihua.common.model.vos.community.Base64File;
			import com.panzhihua.common.utlis.*;
			import net.coobird.thumbnailator.Thumbnails;
			@@ -306,8 +309,23 @@
			@ApiOperation("银联退款查询接口")
			@GetMapping("/unionpayRefundQuery")
			public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
			String map= RefundQuery.refundQuery(merOrderId);
			return R.ok(map);
			// String map= RefundQuery.refundQuery(merOrderId);

			R r=communityService.queryById("5935");
			log.error("花城洗车银联退款数据：" + r);
			// if(r.getCode()==200)
			// {
			// UnionpayCarWash wash= JSONObject.parseObject(r.getData().toString(),UnionpayCarWash.class);
			// if(wash!=null)
			// {
			// String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());
			// log.error("花城洗车银联退款数据2 ：" + re);
			// }
			//
			// }


			return communityService.queryById("5935");
			}

			@@ -192,7 +192,7 @@
			R r=communityService.carWashById(merOrderId);
			if(r.getCode()==200)
			{
			UnionpayCarWash unionpayCarWash=(UnionpayCarWash)r.getData();
			UnionpayCarWash unionpayCarWash= (UnionpayCarWash) r.getData();
			//调用uu洗车支付成功回调
			Map map=new HashMap();
			map.put("orderId",unionpayCarWash.getCarWashId());
			@@ -238,7 +238,7 @@
			R r=communityService.queryById(desMap.get("orderId"));
			if(r.getCode()==200)
			{
			UnionpayCarWash wash=(UnionpayCarWash)r.getData();
			UnionpayCarWash wash= (UnionpayCarWash) r.getData();
			if(wash!=null)
			{
			String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());

			@@ -8,9 +8,6 @@
			import lombok.NoArgsConstructor;

			@Data
			@Builder
			@AllArgsConstructor
			@NoArgsConstructor
			@ApiModel("银联支付和洗车订单关联表")
			public class UnionpayCarWash
			{

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/UnionpayCarWash.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史