上朵分销系统

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -73,7 +73,7 @@ public class Order implements java.io.Serializable{
 	private String salesPorderid;		//试用订单id
 	private Integer salesOrderType;		//订单类型		1：正常订单（默认）	2：试用订单
 	private String salesAuditRemark;	//审批备注
-	private Integer salesIsRfund;	//是否已退款
+	private Integer salesIsRfund;	//是否已退款  2已标记为已退款
 	
 	// -------------------------------------------- 新增
 	private String storesName;			// 用户第二级上线

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -8,6 +8,8 @@ import com.iamberry.wechat.face.apparatus.ApparatusService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.payUtil.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -29,6 +31,9 @@ import java.util.Map;
 @Controller("scannQr")
 @RequestMapping("/wechat")
 public class QrCodeHandler {
+
+    private Logger logger = LoggerFactory.getLogger(QrCodeHandler.class);
+
     @Autowired
     ApparatusService apparatusService;
     @Autowired
@@ -52,6 +57,10 @@ public class QrCodeHandler {
         }
         boolean isActivation = false;//是否激活
         Member memberInfo = WechatUtils.getUserBySession(req);
+
+        logger.info("扫描二维码："+qrCode+"===微信openid为："+memberInfo.getUserOpenid());
+        System.out.println("扫描二维码："+qrCode+"===微信openid为："+memberInfo.getUserOpenid());
+
         Apparatus apparatus = new Apparatus();
         apparatus.setApparatusBarcode(qrCode);
         /*apparatus.setUserOpenid(memberInfo.getUserOpenid());*/

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -259,7 +259,7 @@
 											退款申请中
 										</c:when>
 										<c:when test="${order.salesStatus ==4 }">
-											已退款
+											已退款<c:if test="${order.salesIsRfund ==2 }"><br>(财务已退款)</c:if>
 										</c:when>
 										<c:when test="${order.salesStatus ==5 }">
 											已发货