提交代码;

app/src/main/java/com/xingdata/zzdpos/api/Pay.java

@@ -2,9 +2,27 @@ package com.xingdata.zzdpos.api;
 
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.blankj.utilcode.util.TimeUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 public class Pay {
     public static class Request {
+
+        public Request(int payChannelType) {
+            setOrderType("01");
+            setPayChannelType(payChannelType + "");
+            setDeviceType("02");
+            setMch_id("11");
+            setTer_id("00000011");
+            setOrderDateTime(TimeUtils.getNowString(new SimpleDateFormat("yyyymmddHHMMSS", Locale.getDefault())));
+            setCurrencyType("156");
+            setOrderName("测试");
+            setKey("Key");
+            setNotifyUrl("setNotifyUrl");
+        }
+
         private String OrderType;
         private String PayChannelType;
         private String DeviceType;
@@ -20,6 +38,7 @@ public class Pay {
         private String ChannelAuthCode;
         private String Key;
         private String NotifyUrl;
+        private String OldOrderNo;
 
         @JSONField(name = "OrderType")
         public String getOrderType() {
@@ -170,6 +189,16 @@ public class Pay {
         public void setNotifyUrl(String notifyUrl) {
             NotifyUrl = notifyUrl;
         }
+
+        @JSONField(name = "OldOrderNo")
+        public String getOldOrderNo() {
+            return OldOrderNo;
+        }
+
+        @JSONField(name = "OldOrderNo")
+        public void setOldOrderNo(String oldOrderNo) {
+            OldOrderNo = oldOrderNo;
+        }
     }
 
     public class Response {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java

@@ -10,6 +10,7 @@ import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.adapter.MsAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.List;
 
@@ -28,6 +29,7 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
         mMsAdapter = new MsAdapter();
         mViewBinding.rlMs.setAdapter(mMsAdapter);
         mViewBinding.rlMs.setLayoutManager(new LinearLayoutManager(mContext));
+        mViewBinding.rlMs.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(1, mContext.getResources().getDimensionPixelOffset(R.dimen.all_margin), true));
 
         // set ms listener
         mViewBinding.srlMs.setOnRefreshListener(this::refreshMs);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupCateView.java

@@ -80,9 +80,7 @@ public class GroupCateView extends BaseGroupView<ViewGroupCateBinding> {
     @Override
     public void initView() {
         super.initView();
-
-        cateId = mMs.getSpuCateId();
-
+        if (mMs != null) cateId = mMs.getSpuCateId();
         loadCla();
 
         mViewBinding.nsType1.setOnItemSelectedListener(mOnItemSelectedListener);

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -3,7 +3,6 @@ package com.xingdata.zzdpos.ui.settle;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.StringUtils;
-import com.blankj.utilcode.util.TimeUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -20,10 +19,8 @@ import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import io.reactivex.Observable;
 
@@ -229,45 +226,30 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInAli(String payCode) {
-        Pay.Request q = new Pay.Request();
-        q.setOrderType("1");
-        q.setPayChannelType("3");
-        q.setDeviceType("2");
-        q.setMch_id("11");
-        q.setTer_id("11");
-        q.setOrderDateTime(TimeUtils.getNowString(new SimpleDateFormat("yyyymmddHHMMSS", Locale.getDefault())));
-        q.setCurrencyType("156");
+        Pay.Request q = new Pay.Request(C.PAY_CHANNEL.ALI);
         q.setOrderAmt(ConvertUtil.longToString(mSaleorder.getOrderPayAmt()));
-        q.setOrderName("测试");
         q.setChannelAuthCode(payCode);
-        q.setKey("Key");
-        q.setNotifyUrl("setNotifyUrl");
-        subscribePay(commitOrder().flatMap(s -> {
-            q.setOrderNo(s);
-            return JniFactory.Settle.pay(JSON.toJSONString(q));
-        }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.ALI))));
+        subscribePay(commitOrder()
+                .flatMap(s -> {
+                    q.setOrderNo(s);
+                    q.setOldOrderNo(s);
+                    return JniFactory.Settle.pay(JSON.toJSONString(q));
+                }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.ALI))));
 
     }
 
     @Override
     public void payInWechat(String payCode) {
-        Pay.Request q = new Pay.Request();
-        q.setOrderType("1");
-        q.setPayChannelType("2");
-        q.setDeviceType("2");
-        q.setMch_id("11");
-        q.setTer_id("11");
-        q.setOrderDateTime(TimeUtils.getNowString(new SimpleDateFormat("yyyymmddHHMMSS", Locale.getDefault())));
-        q.setCurrencyType("156");
+        Pay.Request q = new Pay.Request(C.PAY_CHANNEL.WECHAT);
         q.setOrderAmt(ConvertUtil.longToString(mSaleorder.getOrderPayAmt()));
-        q.setOrderName("测试");
         q.setChannelAuthCode(payCode);
-        q.setKey("Key");
-        q.setNotifyUrl("setNotifyUrl");
-        subscribePay(commitOrder().flatMap(s -> {
-            q.setOrderNo(s);
-            return JniFactory.Settle.pay(JSON.toJSONString(q));
-        }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.WECHAT))));
+        subscribePay(commitOrder()
+                .flatMap(s -> {
+                    q.setOrderNo(s);
+                    q.setOldOrderNo(s);
+                    return JniFactory.Settle.pay(JSON.toJSONString(q));
+                })
+                .flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.WECHAT))));
     }
 
     @Override

app/src/main/res/layout/item_ms.xml

@@ -4,13 +4,12 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:layout_marginEnd="@dimen/all_margin"
-            android:layout_marginStart="@dimen/all_margin"
             android:background="@mipmap/bg_marketing"
             android:foreground="?android:attr/selectableItemBackground"
             android:orientation="vertical">
@@ -71,7 +70,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="10dp"
-            />
+            android:background="@mipmap/bg_marketing_02" />
 
 
     </LinearLayout>